From a2b1ad759439ed30202d6fcb75006fbd1d17a2f6 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 4 May 2015 20:13:47 +0000 Subject: [PATCH] 98_SVG.pm: fix endPlotNow (Forum #36891) git-svn-id: https://svn.fhem.de/fhem/trunk@8524 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_SVG.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index c78c72f3e..2b0736951 100755 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -818,7 +818,7 @@ SVG_calcOffsets($$) { my ($d,$wl) = @_; - my $pm = AttrVal($d,"plotmode",$FW_plotmode); + my $pm = AttrVal($wl,"plotmode",$FW_plotmode); return if($pm eq "gnuplot"); my ($fr, $fo); @@ -843,8 +843,7 @@ SVG_calcOffsets($$) $fo = AttrVal( $wl, "fixedoffset", undef); } - my $off = $FW_pos{$d}; - $off = 0 if(!$off); + my $off = 0; $off += $FW_pos{off} if($FW_pos{off}); $off = $fo if(defined($fo) && $fo =~ m/^[+-]?\d+$/); @@ -863,7 +862,7 @@ SVG_calcOffsets($$) my @zrange = split(" ", $zoom); #fixedrange with offset if(defined($zrange[1])) { $off += $zrange[1]; $zoom=$zrange[0]; } #fixedrange with offset - my $endPlotNow = (SVG_Attr($FW_wname, $d, "endPlotNow", undef) && !$st); + my $endPlotNow = (SVG_Attr($FW_wname, $wl, "endPlotNow", undef) && !$st); if($zoom eq "hour") { if($endPlotNow) { my $t = int(($now + $off*3600 - 3600)/300.0)*300 + 300; @@ -914,7 +913,7 @@ SVG_calcOffsets($$) } elsif($zoom eq "week") { my @l = localtime($now); - my $start = (SVG_Attr($FW_wname, $d, "endPlotToday", undef) ? 6 : $l[6]); + my $start = (SVG_Attr($FW_wname, $wl, "endPlotToday", undef) ? 6 : $l[6]); my $t = $now - ($start*86400) + ($off*86400)*7; @l = localtime($t); $SVG_devs{$d}{from} = SVG_tspec(3,0,@l); @@ -923,7 +922,7 @@ SVG_calcOffsets($$) } elsif($zoom eq "month") { my ($endDay, @l); - if(SVG_Attr($FW_wname, $d, "endPlotToday", undef)) { + if(SVG_Attr($FW_wname, $wl, "endPlotToday", undef)) { @l = localtime($now+86400); $endDay = $l[3]; $off--;