2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00

98_svg.pm: plotmode gnuplot-scroll related fixes (Forum #73444)

git-svn-id: https://svn.fhem.de/fhem/trunk@14559 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-06-23 17:51:32 +00:00
parent 2788bb2675
commit b47749730c

View File

@ -1105,13 +1105,6 @@ SVG_doShowLog($$$$;$)
my $tmpfile = "/tmp/file.$$"; my $tmpfile = "/tmp/file.$$";
my $errfile = "/tmp/gnuplot.err"; my $errfile = "/tmp/gnuplot.err";
my $xrange;
if(!$SVG_devs{$d}{from}) {
$xrange = "\n"; #We don't have a range, but need the new line
} else {
$xrange = "set xrange [\"$f\":\"$t\"]\n";
}
my $da = SVG_getData($wl, $f, $t, $srcDesc, 0); # substcfg needs it(!) my $da = SVG_getData($wl, $f, $t, $srcDesc, 0); # substcfg needs it(!)
my $tmpstring = ""; my $tmpstring = "";
@ -1133,10 +1126,11 @@ SVG_doShowLog($$$$;$)
$plot =~ s/\".*?using 1:[^ ]+ /"\"$tmpfile\" i " . $i++ . " using 1:2 "/gse; $plot =~ s/\".*?using 1:[^ ]+ /"\"$tmpfile\" i " . $i++ . " using 1:2 "/gse;
my $gplot_script = SVG_substcfg(0, $wl, $cfg, $plot, $file, $tmpfile); my $gplot_script = SVG_substcfg(0, $wl, $cfg, $plot, $file, $tmpfile);
$gplot_script =~ s/<TMPFILE>/$tmpfile/g;
$plot =~ s/ls \w+//g; $plot =~ s/ls \w+//g;
open(FH, "|gnuplot >> $errfile 2>&1");# feed it to gnuplot open(FH, "|gnuplot >> $errfile 2>&1");# feed it to gnuplot
print FH $gplot_script, $xrange, $plot; print FH $gplot_script;
close(FH); close(FH);
unlink($tmpfile); unlink($tmpfile);