Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_SVG.pm: shift bars-type (Forum #35022)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8219 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-03-15 11:48:36 +00:00
parent 7619c3a5ca
commit 8d7916d76f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_SVG.pm
View File

@ -202,6 +202,7 @@ SVG_FwFn($$$$)
$ret .= "<div id='jsSVG_$d' class='jsSVG' ". $ret .= "<div id='jsSVG_$d' class='jsSVG' ".
"data-webAttr='".jsSVG_getAttrs($FW_wname, \%webattrflt)."' ". "data-webAttr='".jsSVG_getAttrs($FW_wname, \%webattrflt)."' ".
"data-svgAttr='".jsSVG_getAttrs($d)."' ". "data-svgAttr='".jsSVG_getAttrs($d)."' ".
"data-svgName='".$d."' ".
"data-from='".$SVG_devs{$d[0]}{from}."' ". "data-from='".$SVG_devs{$d[0]}{from}."' ".
"data-to='" .$SVG_devs{$d[0]}{to} ."' ". "data-to='" .$SVG_devs{$d[0]}{to} ."' ".
"data-gplotFile='$gplot' source='$d[0]'>". "data-gplotFile='$gplot' source='$d[0]'>".
@ -1354,9 +1355,6 @@ SVG_render($$$$$$$$$$)
if($conf{xrange} && $conf{xrange} =~ /\[(.*):(.*)\]/) { if($conf{xrange} && $conf{xrange} =~ /\[(.*):(.*)\]/) {
$xmin = $1 if($1 ne ""); $xmin = $1 if($1 ne "");
$xmax = $2 if($2 ne ""); $xmax = $2 if($2 ne "");
#$fromsec = $xmin;
#$tosec = $xmax;
} }
$xtics = defined($conf{xtics}) ? $conf{xtics} : ""; $xtics = defined($conf{xtics}) ? $conf{xtics} : "";
@ -1811,7 +1809,7 @@ SVG_render($$$$$$$$$$)
# bars are all of equal width (see far above !), # bars are all of equal width (see far above !),
# position rounded to integer multiples of bar width # position rounded to integer multiples of bar width
foreach my $i (0..int(@{$dxp})-1) { foreach my $i (0..int(@{$dxp})-1) {
my ($x1, $y1) = ( $x +4 + $dxp->[$i] - $bw, my ($x1, $y1) = ( $x + $dxp->[$i] - $bw,
$y +$h-($dyp->[$i]-$min)*$hmul); $y +$h-($dyp->[$i]-$min)*$hmul);
my ($x2, $y2) = ($bw, ($dyp->[$i]-$min)*$hmul); my ($x2, $y2) = ($bw, ($dyp->[$i]-$min)*$hmul);
SVG_pO "<rect $attributes $lStyle x=\"$x1\" y=\"$y1\" ". SVG_pO "<rect $attributes $lStyle x=\"$x1\" y=\"$y1\" ".