FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-08 05:15:10 +00:00
Code Issues Releases Wiki Activity

98_SVG.pm: interpret the .gplot file timefmt directive (Forum #137398)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28616 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2024-03-08 14:50:18 +00:00
parent 424659fa80
commit 23c7a3fdc0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/98_SVG.pm
View File

@ -34,7 +34,7 @@ use vars qw($FW_CSRF);
my $SVG_RET; # Returned data (SVG) my $SVG_RET; # Returned data (SVG)
sub SVG_calcOffsets($$); sub SVG_calcOffsets($$);
sub SVG_doround($$$); sub SVG_doround($$$);
sub SVG_fmtTime($$); sub SVG_fmtTime($$;$);
sub SVG_pO($); sub SVG_pO($);
sub SVG_readgplotfile($$$); sub SVG_readgplotfile($$$);
sub SVG_render($$$$$$$$$$); sub SVG_render($$$$$$$$$$);
@ -1733,7 +1733,7 @@ SVG_render($$$$$$$$$$)
$off1 = $x; $off1 = $x;
$off2 = $y+$h+$th; $off2 = $y+$h+$th;
$isDE = (AttrVal("global", "language","EN") eq "DE"); $isDE = (AttrVal("global", "language","EN") eq "DE");
my $t = SVG_fmtTime($first_tag, $fromsec); my $t = SVG_fmtTime($first_tag, $fromsec, $conf{timefmt});
SVG_pO "<text x=\"0\" y=\"$off2\" class=\"ylabel\">$t</text>" SVG_pO "<text x=\"0\" y=\"$off2\" class=\"ylabel\">$t</text>"
if(!$conf{xrange}); if(!$conf{xrange});
$initoffset = $step; $initoffset = $step;
@ -1782,7 +1782,7 @@ SVG_render($$$$$$$$$$)
} else { } else {
$off1 = int($x+($i-$fromsec)*$tmul); $off1 = int($x+($i-$fromsec)*$tmul);
} }
$t = SVG_fmtTime($tag, $i); $t = SVG_fmtTime($tag, $i, $conf{timefmt});
if($off1 < $x+10) { # first text, too close to the date field if($off1 < $x+10) { # first text, too close to the date field
SVG_pO "<text x=\"$off1\" y=\"$off2\" class=\"ylabel\" " . SVG_pO "<text x=\"$off1\" y=\"$off2\" class=\"ylabel\" " .
"text-anchor=\"left\">$t</text>"; "text-anchor=\"left\">$t</text>";
@ -2405,9 +2405,15 @@ SVG_calcControlPoints($$$$$$)
} }
sub sub
SVG_fmtTime($$) SVG_fmtTime($$;$)
{ {
my ($sepfmt, $sec) = @_; my ($sepfmt, $sec, $timefmt) = @_;
if($timefmt && $timefmt ne '"%Y-%m-%d_%H:%M:%S"') { #137398
$timefmt =~ s/^"|"$//g;
return ResolveDateWildcards($timefmt, localtime($sec))
}
my @tarr = split("[ :]+", localtime($sec)); my @tarr = split("[ :]+", localtime($sec));
my ($sep, $fmt) = split(" ", $sepfmt, 2); my ($sep, $fmt) = split(" ", $sepfmt, 2);
my $ret = ""; my $ret = "";