FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

98_SVG.pm: add xrange patches (Forum #66489)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13394 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-02-11 21:29:40 +00:00
parent 993bfe465e
commit 8157e42510
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/98_SVG.pm
View File

@ -1418,10 +1418,20 @@ SVG_render($$$$$$$$$$)
($off1,$off2) = ($ow-$nr_right_axis*$axis_width-$th, $y+$th); ($off1,$off2) = ($ow-$nr_right_axis*$axis_width-$th, $y+$th);
my ($xmin, $xmax, $xtics); my ($xmin, $xmax, $xtics)= (99999999, -99999999, "");
if($conf{xrange} && $conf{xrange} =~ /\[(.*):(.*)\]/) { if(defined($conf{xrange})) {
$xmin = $1 if($1 ne ""); my $idx= 1;
$xmax = $2 if($2 ne ""); while(defined($data{"xmin$idx"})) {
$xmin= $data{"xmin$idx"} if($data{"xmin$idx"}< $xmin);
$xmax= $data{"xmax$idx"} if($data{"xmax$idx"}> $xmax);
$idx++;
}
#main::Debug "xmin= $xmin xmax=$xmax";
$conf{xrange} = AnalyzeCommand(undef, $1) if($conf{xrange} =~ /^({.*})$/);
if($conf{xrange} =~ /\[(.*):(.*)\]/) {
$xmin = $1 if($1 ne "");
$xmax = $2 if($2 ne "");
}
} }
$xtics = defined($conf{xtics}) ? $conf{xtics} : ""; $xtics = defined($conf{xtics}) ? $conf{xtics} : "";
@ -1471,7 +1481,7 @@ SVG_render($$$$$$$$$$)
} elsif( $l =~ /^;/ ) { #allow ;special lines } elsif( $l =~ /^;/ ) { #allow ;special lines
if( $l =~ m/^;p (\S+)\s(\S+)/ ) {# point if( $l =~ m/^;p (\S+)\s(\S+)/ ) {# point
my $xmul = $w/($xmax-$xmin) if( $conf{xrange} ); my $xmul = $w/($xmax-$xmin) if($xmax-$xmin > 0 );
my $x1; my $x1;
if( $conf{xrange} ) { if( $conf{xrange} ) {
$x1 = int(($1-$xmin)*$xmul); $x1 = int(($1-$xmin)*$xmul);