FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 01:14:19 +00:00
Code Issues Releases Wiki Activity

98_SVG.pm: adjust JavaScript & Style

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7634 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-19 22:03:17 +00:00
parent 7659463747
commit 6d8ea047d4
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/98_SVG.pm
View File

@ -1797,7 +1797,6 @@ SVG_render($$$$$$$$$;$$)
my %lt =(cubic=>"C",cubicSmooth=>"S",quadratic=>"Q",quadraticSmooth=>"T"); my %lt =(cubic=>"C",cubicSmooth=>"S",quadratic=>"Q",quadraticSmooth=>"T");
my ($x1, $y1); my ($x1, $y1);
my $lt = ($lt{$lType} ? $lt{$lType} : "L"); # defaults to line my $lt = ($lt{$lType} ? $lt{$lType} : "L"); # defaults to line
my $qs = ($lType eq "quadraticSmooth");
foreach my $i (0..int(@{$dxp})-1) { foreach my $i (0..int(@{$dxp})-1) {
if( !defined($dxp->[$i]) ) { # specials if( !defined($dxp->[$i]) ) { # specials

15
fhem/www/pgm2/svg.js
View File

@ -88,18 +88,21 @@ sv_menu(evt, embed)
var tl = $(svg).find("#svg_title"); var tl = $(svg).find("#svg_title");
var par = svgNode.par; var par = svgNode.par;
var sn = selNode.nodeName,
pn = (sn=="path" ? "d" : "points"),
arrName = (sn=="path" ? "pathSegList" : "points");
FW_menu(evt, label, FW_menu(evt, label,
["Copy", "Paste", ["Copy", "Paste",
svgNode.isSingle ? "Show all lines":"Hide other lines", svgNode.isSingle ? "Show all lines":"Hide other lines",
selNode.showVal ? "Stop displaying values" : "Display plot values" ], 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) { function(arg) {
//////////////////////////////////// copy //////////////////////////////////// copy
if(arg == 0) { if(arg == 0) {
document.cookie="fhemweb="+ document.cookie="fhemweb="+
$(sel).attr("y_min")+":"+$(sel).attr("y_mul")+":"+ $(sel).attr("y_min")+":"+$(sel).attr("y_mul")+":"+
svg_compressPoints($(sel).attr("points")); svg_compressPoints($(sel).attr(pn));
} }
//////////////////////////////////// paste //////////////////////////////////// paste
@ -107,7 +110,7 @@ sv_menu(evt, embed)
var doc = $(svg).get(0).ownerDocument; var doc = $(svg).get(0).ownerDocument;
var o=doc.createElementNS(svgNS, "polyline"); var o=doc.createElementNS(svgNS, "polyline");
o.setAttribute("class", "pasted"); 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 h = parseFloat($(sel).attr("y_h"));
var ny_mul = parseFloat(data[1]); var ny_mul = parseFloat(data[1]);
@ -133,7 +136,7 @@ sv_menu(evt, embed)
svgNode.isSingle = 1; svgNode.isSingle = 1;
$(sel).attr("stroke-width", 3); $(sel).attr("stroke-width", 3);
$(tl).attr("hiddentitle", $(tl).text()); $(tl).attr("hiddentitle", $(tl).text());
if($(sel).attr("points") != null) if($(sel).attr(pn) != null)
$(tl).text($(label).attr("title")); $(tl).text($(label).attr("title"));
showOtherLines(1, 0); showOtherLines(1, 0);
} }
@ -166,7 +169,7 @@ sv_menu(evt, embed)
$("#content").offset().top-50; $("#content").offset().top-50;
$("#content").append(par.div); $("#content").append(par.div);
var pl = selNode.points; var pl = selNode[arrName];
if(pl.length > 2) if(pl.length > 2)
mousemove({pageX:pl[pl.length-2].x}); mousemove({pageX:pl[pl.length-2].x});
} }
@ -177,7 +180,7 @@ sv_menu(evt, embed)
function function
mousemove(e) 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) if(!embed)
xRaw -= $(svg).offset().left; xRaw -= $(svg).offset().left;
for(i1=0; i1<l; i1++) for(i1=0; i1<l; i1++)

4
fhem/www/pgm2/svg_style.css
View File

@ -2,8 +2,8 @@
text { font-family:Times; font-size:12px; } 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.legend { cursor:pointer; }
text.paste { text-decoration:underline; stroke:none; fill:blue; } circle#svgmarker { color:#278727; opacity:0.5; }
path { stroke:black; fill:none; } path { stroke:black; fill:none; }
polyline { stroke:black; fill:none; } polyline { stroke:black; fill:none; }