From fff1b0756338da0bbd2d77a44b34903178e2f435 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 2 Jan 2015 16:37:36 +0000 Subject: [PATCH] SVG/FileLog: remove the limit of 8 lines per Plot git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7409 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 1 - fhem/FHEM/98_SVG.pm | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 0efce07fd..3287d1afc 100755 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -947,7 +947,6 @@ FileLog_sampleDataFn($$$$$) FileLog_addTics($conf->{y2tics}, \%tickh); $colnums = join(",", sort keys %tickh).",$colnums" if(%tickh); - $max = 8 if($max > 8); my @htmlArr; for(my $r=0; $r < $max; $r++) { my @f = split(":", ($flog->[$r] ? $flog->[$r] : ":::"), 4); diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index ca8ddd26f..e67008e0c 100755 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -314,7 +314,6 @@ SVG_PEdit($$$$) $ret .= ""; my $max = @{$conf{lType}}+1; - $max = 8 if($max > 8); my ($desc, $htmlArr, $example) = ("Spec", undef, ""); if($modules{$ldt}{SVG_sampleDataFn}) { no strict "refs"; @@ -474,11 +473,12 @@ SVG_WriteGplot($) return 0; } - my $hasTl; - for(my $i=0; $i <= 8; $i++) { - $hasTl = 1 if($FW_webArgs{"title_$i"}); + my $maxLines = 0; + foreach my $i (keys %FW_webArgs) { + next if($i !~ m/^title_(.*)$/); + $maxLines = $1 if($1 > $maxLines); } - return 0 if(!$hasTl); + return 0 if(!$maxLines); my $fName = $FW_webArgs{gplotName}; return if(!$fName); @@ -503,7 +503,7 @@ SVG_WriteGplot($) my $ld = $FW_webArgs{logdevicetype}; my @plot; - for(my $i=0; $i <= 8; $i++) { + for(my $i=0; $i <= $maxLines; $i++) { next if(!$FW_webArgs{"title_$i"}); my $prf = "par_${i}_"; my @v = map {$FW_webArgs{"$prf$_"}}