FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-05 08:20:23 +00:00
Code Issues Releases Wiki Activity

Label may contain now a single :

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@867 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-03-17 18:51:12 +00:00
parent 437afb7646
commit d652801c91
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/TODO
View File

@ -1,5 +1,5 @@
FHEM: FHEM:
- fork problem (?) - uniform .gplot "set title" and naming (ks300_1.gplot -> tempRain.gplot)
- HomeMatic signing - HomeMatic signing
- HomeMatic set log 2 - HomeMatic set log 2
- mergelog - mergelog

4
fhem/docs/commandref.html
View File

@ -5516,7 +5516,7 @@ Terminating
<li><a href="#plotmode">plotmode</a></li> <li><a href="#plotmode">plotmode</a></li>
<a name="label"></a> <a name="label"></a>
<li>label<br> <li>label<br>
Colon separated list of values. The values will be used to replace Double-Colon separated list of values. The values will be used to replace
&lt;L#&gt; type of strings in the .gplot file, with # beginning at 1 &lt;L#&gt; type of strings in the .gplot file, with # beginning at 1
(&lt;L1&gt;, &lt;L2&gt;, etc.). Each value will be evaluated as a perl (&lt;L1&gt;, &lt;L2&gt;, etc.). Each value will be evaluated as a perl
expression, so you have access e.g. to the $value hash.<br><br> expression, so you have access e.g. to the $value hash.<br><br>
@ -5530,7 +5530,7 @@ Terminating
<li>Fixed text for the right and left axis:<br> <li>Fixed text for the right and left axis:<br>
<ul> <ul>
<li>Fhem config:<br> <li>Fhem config:<br>
attr wl_1 label "Temperature":"Humidity"</li> attr wl_1 label "Temperature"::"Humidity"</li>
<li>.gplot file entry:<br> <li>.gplot file entry:<br>
set ylabel &lt;L1&gt;<br> set ylabel &lt;L1&gt;<br>
set y2label &lt;L2&gt;</li> set y2label &lt;L2&gt;</li>

3
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -495,6 +495,7 @@ FW_updateHashes()
foreach my $d (sort keys %defs ) { foreach my $d (sort keys %defs ) {
next if(IsIgnored($d)); next if(IsIgnored($d));
my $t = AttrVal($d, "subType", $defs{$d}{TYPE}); my $t = AttrVal($d, "subType", $defs{$d}{TYPE});
$t = AttrVal($d, "model", $t) if($t eq "unknown");
$FW_types{$t}{$d} = 1; $FW_types{$t}{$d} = 1;
} }
@ -1023,7 +1024,7 @@ FW_substcfg($$$$$$)
my $label = AttrVal($wl, "label", undef); my $label = AttrVal($wl, "label", undef);
my @g_label; my @g_label;
if ($label) { if ($label) {
@g_label = split(":",$label); @g_label = split("::",$label);
foreach (@g_label) { foreach (@g_label) {
$_ = AnalyzeCommand(undef, "{ $_ }"); $_ = AnalyzeCommand(undef, "{ $_ }");
} }

2
fhem/webfrontend/pgm2/98_SVG.pm
View File

@ -87,6 +87,7 @@ SVG_render($$$$$$$)
pO "<text id=\"svg_title\" x=\"$off1\" y=\"$off2\" " . pO "<text id=\"svg_title\" x=\"$off1\" y=\"$off2\" " .
"class=\"title\" text-anchor=\"middle\">$title</text>"; "class=\"title\" text-anchor=\"middle\">$title</text>";
# Copy and Paste labels, hidden by default
pO "<text id=\"svg_paste\" x=\"" . ($ow-$x) . "\" y=\"$off2\" " . pO "<text id=\"svg_paste\" x=\"" . ($ow-$x) . "\" y=\"$off2\" " .
"onclick=\"parent.svg_paste(evt)\" " . "onclick=\"parent.svg_paste(evt)\" " .
"class=\"paste\" text-anchor=\"end\"> </text>"; "class=\"paste\" text-anchor=\"end\"> </text>";
@ -123,7 +124,6 @@ SVG_render($$$$$$$)
($off1,$off2) = ($ow-$x-$th, $y+$th); ($off1,$off2) = ($ow-$x-$th, $y+$th);
for my $i (0..int(@ltitle)-1) { for my $i (0..int(@ltitle)-1) {
my $j = $i+1; my $j = $i+1;
my $t = $ltitle[$i]; my $t = $ltitle[$i];

4
fhem/webfrontend/pgm2/ks300_2.gplot
View File

@ -10,10 +10,10 @@ set timefmt "%Y-%m-%d_%H:%M:%S"
set xlabel " " set xlabel " "
set ytics nomirror set ytics nomirror
set y2tics set y2tics
set title '<TL>' set title '<L1>'
set grid set grid
set ylabel "Wind (Km/h)" set ylabel "Wind (km/h)"
set y2label "Humidity (%)" set y2label "Humidity (%)"
#FileLog 8:IR:0: #FileLog 8:IR:0:

19
fhem/webfrontend/pgm2/svg_style.css
View File

@ -4,18 +4,17 @@ text { font-family:Times; font-size:12px; }
text.title { font-size:16px; } text.title { font-size:16px; }
text.copy { text-decoration:underline; stroke:none; fill:blue; } text.copy { text-decoration:underline; stroke:none; fill:blue; }
text.paste { text-decoration:underline; stroke:none; fill:blue; } text.paste { text-decoration:underline; stroke:none; fill:blue; }
text.l0 { test-decoration:underline; stroke:none; fill:red; } text.l0 { text-decoration:underline; stroke:none; fill:red; }
text.l1 { test-decoration:underline; stroke:none; fill:green; } text.l1 { text-decoration:underline; stroke:none; fill:green; }
text.l2 { test-decoration:underline; stroke:none; fill:blue; } text.l2 { text-decoration:underline; stroke:none; fill:blue; }
text.l3 { test-decoration:underline; stroke:none; fill:magenta; } text.l3 { text-decoration:underline; stroke:none; fill:magenta; }
text.l4 { test-decoration:underline; stroke:none; fill:brown; } text.l4 { text-decoration:underline; stroke:none; fill:brown; }
text.l5 { test-decoration:underline; stroke:none; fill:black; } text.l5 { text-decoration:underline; stroke:none; fill:black; }
text.l6 { test-decoration:underline; stroke:none; fill:olive; } text.l6 { text-decoration:underline; stroke:none; fill:olive; }
text.l7 { test-decoration:underline; stroke:none; fill:gray; } text.l7 { text-decoration:underline; stroke:none; fill:gray; }
text.l8 { test-decoration:underline; stroke:none; fill:yellow; } text.l8 { text-decoration:underline; stroke:none; fill:yellow; }
polyline { stroke:black; fill:none; } polyline { stroke:black; fill:none; }
;.border { stroke:black; fill:none; }
.border { stroke:black; fill:url(#grad1); } .border { stroke:black; fill:url(#grad1); }
.vgrid { stroke:gray; stroke-dasharray:2,6; } .vgrid { stroke:gray; stroke-dasharray:2,6; }
.hgrid { stroke:gray; stroke-dasharray:2,6; } .hgrid { stroke:gray; stroke-dasharray:2,6; }