Label may contain now a single :

git-svn-id: https://svn.fhem.de/fhem/trunk@867 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/TODO

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

fhem/docs/commandref.html

@@ -5516,7 +5516,7 @@ Terminating
     <li><a href="#plotmode">plotmode</a></li>
     <a name="label"></a>
     <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;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>
@@ -5530,7 +5530,7 @@ Terminating
         <li>Fixed text for the right and left axis:<br>
           <ul>
             <li>Fhem config:<br>
-                attr wl_1 label "Temperature":"Humidity"</li>
+                attr wl_1 label "Temperature"::"Humidity"</li>
             <li>.gplot file entry:<br>
                 set ylabel &lt;L1&gt;<br>
                 set y2label &lt;L2&gt;</li>

fhem/webfrontend/pgm2/01_FHEMWEB.pm

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

fhem/webfrontend/pgm2/98_SVG.pm

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

fhem/webfrontend/pgm2/ks300_2.gplot

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

fhem/webfrontend/pgm2/svg_style.css

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