FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

98_SVG.pm: add NHours for fixedRange (Forum #88338)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16816 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-06-04 10:35:20 +00:00
parent 768620e0d5
commit 5d0b782a9c
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fhem/FHEM/98_SVG.pm
View File

@ -942,8 +942,9 @@ SVG_calcOffsets($$)
$fr = AttrVal($wl, "fixedrange", undef); $fr = AttrVal($wl, "fixedrange", undef);
if($fr) { if($fr) {
if($fr =~ "^(hour|qday|day|week|month|year)" || if($fr =~ "^(hour|qday|day|week|month|year)" ||
$fr =~ m/^\d+days$/ || #fixedrange with offset $fr =~ m/^\d+hour/ || #fixedrange with offset
$fr =~ m/^\d+years$/ ) { #fixedrange with offset $fr =~ m/^\d+day/ ||
$fr =~ m/^\d+year/ ) {
$frx=$fr; #fixedrange with offset $frx=$fr; #fixedrange with offset
} else { } else {
@ -979,18 +980,19 @@ SVG_calcOffsets($$)
if(defined($zrange[1])) { $off += $zrange[1]; $zoom=$zrange[0]; } #fixedrange with offset if(defined($zrange[1])) { $off += $zrange[1]; $zoom=$zrange[0]; } #fixedrange with offset
my $endPlotNow = (SVG_Attr($FW_wname, $wl, "endPlotNow", undef) && !$st); my $endPlotNow = (SVG_Attr($FW_wname, $wl, "endPlotNow", undef) && !$st);
if($zoom eq "hour") { if($zoom =~ m/^(\d+)?hour/) {
my $nHours = $1 ? ($1-1) : 0;
if($endPlotNow) { if($endPlotNow) {
my $t = int(($now + $off*3600 - 3600)/300.0)*300 + 300; my $t = int(($now + ($off-$nHours-1)*3600)/300.0)*300 + 300;
my @l = localtime($t); my @l = localtime($t);
$SVG_devs{$d}{from} = SVG_tspec(@l); $SVG_devs{$d}{from} = SVG_tspec(@l);
@l = localtime($t+3599); @l = localtime($t+$nHours*3600+3599);
$SVG_devs{$d}{to} = SVG_tspec(@l); $SVG_devs{$d}{to} = SVG_tspec(@l);
} else { } else {
my $t = int($now/3600)*3600 + $off*3600; my $t = int($now/3600)*3600 + ($off-$nHours)*3600;
my @l = localtime($t); my @l = localtime($t);
$SVG_devs{$d}{from} = SVG_tspec(@l); $SVG_devs{$d}{from} = SVG_tspec(@l);
@l = localtime($t+3600-1); @l = localtime($t+($nHours+1)*3600-1);
$SVG_devs{$d}{to} = SVG_tspec(@l); $SVG_devs{$d}{to} = SVG_tspec(@l);
} }
@ -1627,9 +1629,12 @@ SVG_render($$$$$$$$$$)
my $ddur = ($tosec-$fromsec)/86400; my $ddur = ($tosec-$fromsec)/86400;
my ($first_tag, $tag, $step, $tstep, $aligntext, $aligntics); my ($first_tag, $tag, $step, $tstep, $aligntext, $aligntics);
if($ddur <= 0.1) { if($ddur <= 0.05) {
$first_tag=". 2 1"; $tag=": 3 4"; $step = 300; $tstep = 60; $first_tag=". 2 1"; $tag=": 3 4"; $step = 300; $tstep = 60;
} elsif($ddur <= 0.2) {
$first_tag=". 2 1"; $tag=": 3 4"; $step = 1200; $tstep = 300;
} elsif($ddur <= 0.5) { } elsif($ddur <= 0.5) {
$first_tag=". 2 1"; $tag=": 3 4"; $step = 3600; $tstep = 900; $first_tag=". 2 1"; $tag=": 3 4"; $step = 3600; $tstep = 900;
@ -2566,11 +2571,12 @@ plotAsPng(@)
In plotmode gnuplot-scroll(-svg) or SVG the given time-range will be In plotmode gnuplot-scroll(-svg) or SVG the given time-range will be
used, and no scrolling for this SVG will be possible. Needed e.g. for used, and no scrolling for this SVG will be possible. Needed e.g. for
looking at last-years data without scrolling.<br><br> If the value is looking at last-years data without scrolling.<br><br> If the value is
one of hour, day, &lt;N&gt;days, week, month, year, &lt;N&gt;years then one of hour, &lt;N&gt;hours, day, &lt;N&gt;days, week, month, year,
set the zoom level for this SVG independently of the user specified &lt;N&gt;years then set the zoom level for this SVG independently of
zoom-level. This is useful for pages with multiple plots: one of the the user specified zoom-level. This is useful for pages with multiple
plots is best viewed in with the default (day) zoom, the other one with plots: one of the plots is best viewed in with the default (day) zoom,
a week zoom.<br> the other one with a week zoom.
<br>
If given, the optional integer parameter offset refers to a different If given, the optional integer parameter offset refers to a different
period (e.g. last year: fixedrange year -1, 2 days ago: fixedrange day period (e.g. last year: fixedrange year -1, 2 days ago: fixedrange day
@ -2797,15 +2803,16 @@ plotAsPng(@)
Jahre auf eine Seite anzusehen.<br><br> Jahre auf eine Seite anzusehen.<br><br>
Zweite Alternative:<br> Zweite Alternative:<br>
Wenn der Wert entweder hour, day, &lt;N&gt;days, week, month, year oder Wenn der Wert entweder hour, &lt;N&gt;hours, day, &lt;N&gt;days, week,
&lt;N&gt;years lautet, kann der Zoom-Level f&uuml;r dieses SVG month, year oder &lt;N&gt;years lautet, kann der Zoom-Level f&uuml;r
unabh&auml;ngig vom User-spezifischen Zoom eingestellt werden. Diese dieses SVG unabh&auml;ngig vom User-spezifischen Zoom eingestellt werden.
Einstellung ist n&uuml;tzlich f&uuml;r mehrere Plots auf einer Seite: Diese Einstellung ist n&uuml;tzlich f&uuml;r mehrere Plots auf einer
Eine Grafik ist mit dem Standard-Zoom am aussagekr&auml;ftigsten, die Seite: Eine Grafik ist mit dem Standard-Zoom am aussagekr&auml;ftigsten,
anderen mit einem Zoom &uuml;ber eine Woche. Der optionale ganzzahlige die anderen mit einem Zoom &uuml;ber eine Woche. Der optionale
Parameter [offset] setzt ein anderes Zeitintervall (z.B. letztes Jahr: ganzzahlige Parameter [offset] setzt ein anderes Zeitintervall (z.B.
<code>fixedrange year -1</code>, vorgestern: letztes Jahr: <code>fixedrange year -1</code>, vorgestern: <code>
<code> fixedrange day -2</code>). fixedrange day -2</code>).
</li><br> </li><br>
<a name="label"></a> <a name="label"></a>