From 6d8ea047d40e8c4db18fe59a5f08526ec435261b Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 19 Jan 2015 22:03:17 +0000
Subject: [PATCH] 98_SVG.pm: adjust JavaScript & Style

git-svn-id: https://svn.fhem.de/fhem/trunk@7634 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_SVG.pm         |  1 -
 fhem/www/pgm2/svg.js        | 15 +++++++++------
 fhem/www/pgm2/svg_style.css |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm
index 277f05d42..720803d37 100755
--- a/fhem/FHEM/98_SVG.pm
+++ b/fhem/FHEM/98_SVG.pm
@@ -1797,7 +1797,6 @@ SVG_render($$$$$$$$$;$$)
       my %lt =(cubic=>"C",cubicSmooth=>"S",quadratic=>"Q",quadraticSmooth=>"T");
       my ($x1, $y1);
       my $lt = ($lt{$lType} ? $lt{$lType} : "L"); # defaults to line
-      my $qs = ($lType eq "quadraticSmooth");
       foreach my $i (0..int(@{$dxp})-1) {
 
         if( !defined($dxp->[$i]) ) { # specials
diff --git a/fhem/www/pgm2/svg.js b/fhem/www/pgm2/svg.js
index 55c8715b6..959f21ff1 100644
--- a/fhem/www/pgm2/svg.js
+++ b/fhem/www/pgm2/svg.js
@@ -88,18 +88,21 @@ sv_menu(evt, embed)
   var tl = $(svg).find("#svg_title");
   var par = svgNode.par;
 
+  var sn = selNode.nodeName,
+      pn = (sn=="path" ? "d" : "points"),
+      arrName = (sn=="path" ? "pathSegList" : "points");
   FW_menu(evt, label,
     ["Copy", "Paste",
       svgNode.isSingle ? "Show all lines":"Hide other lines",
       selNode.showVal ? "Stop displaying values" : "Display plot values" ],
-    [undefined, data.length==0, undefined, selNode.nodeName!="polyline"],
+    [undefined, data.length==0, undefined, sn!="polyline" && sn!="path"],
     function(arg) {
 
       //////////////////////////////////// copy
       if(arg == 0) {
         document.cookie="fhemweb="+
               $(sel).attr("y_min")+":"+$(sel).attr("y_mul")+":"+
-              svg_compressPoints($(sel).attr("points"));
+              svg_compressPoints($(sel).attr(pn));
       }
 
       //////////////////////////////////// paste
@@ -107,7 +110,7 @@ sv_menu(evt, embed)
         var doc = $(svg).get(0).ownerDocument;
         var o=doc.createElementNS(svgNS, "polyline");
         o.setAttribute("class", "pasted");
-        o.setAttribute("points", svg_uncompressPoints(data[2]));
+        o.setAttribute(pn, svg_uncompressPoints(data[2]));
 
         var h  = parseFloat($(sel).attr("y_h"));
         var ny_mul = parseFloat(data[1]);
@@ -133,7 +136,7 @@ sv_menu(evt, embed)
           svgNode.isSingle = 1;
           $(sel).attr("stroke-width", 3);
           $(tl).attr("hiddentitle", $(tl).text());
-          if($(sel).attr("points") != null)
+          if($(sel).attr(pn) != null)
             $(tl).text($(label).attr("title"));
           showOtherLines(1, 0);
         }
@@ -166,7 +169,7 @@ sv_menu(evt, embed)
                        $("#content").offset().top-50;
           $("#content").append(par.div);
 
-          var pl = selNode.points;
+          var pl = selNode[arrName];
           if(pl.length > 2)
             mousemove({pageX:pl[pl.length-2].x});
         }
@@ -177,7 +180,7 @@ sv_menu(evt, embed)
   function
   mousemove(e)
   {
-    var xRaw = e.pageX, pl = selNode.points, l = pl.length, i1;
+    var xRaw = e.pageX, pl = selNode[arrName], l = pl.length, i1;
     if(!embed)
       xRaw -= $(svg).offset().left;
     for(i1=0; i1<l; i1++)
diff --git a/fhem/www/pgm2/svg_style.css b/fhem/www/pgm2/svg_style.css
index c46b54660..c7081f8cc 100644
--- a/fhem/www/pgm2/svg_style.css
+++ b/fhem/www/pgm2/svg_style.css
@@ -2,8 +2,8 @@
 
 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.legend { cursor:pointer; }
+circle#svgmarker { color:#278727; opacity:0.5; }
 
 path     { stroke:black; fill:none; }
 polyline { stroke:black; fill:none; }