From bcf68842949b8a88c6ec057fdea7f28455803ed4 Mon Sep 17 00:00:00 2001 From: martinhaas <> Date: Tue, 30 Oct 2007 07:42:38 +0000 Subject: [PATCH] gnuplot for FS20 now only off or on git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@108 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- webfrontend/pgm3/CHANGED | 3 +++ webfrontend/pgm3/HISTORY | 3 +++ webfrontend/pgm3/include/gnuplot.php | 3 ++- webfrontend/pgm3/index.php | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/webfrontend/pgm3/CHANGED b/webfrontend/pgm3/CHANGED index 2f7102cf8..729c27da9 100644 --- a/webfrontend/pgm3/CHANGED +++ b/webfrontend/pgm3/CHANGED @@ -146,3 +146,6 @@ It is not necessary to tell fhem that there are other logs. 2007-10-25 (071025cvs) -- design: userdef-gnuoplot with transparent background +2007-10-20 (071030cvs) +-- fix: gnuplot for FS20 now only off or on + diff --git a/webfrontend/pgm3/HISTORY b/webfrontend/pgm3/HISTORY index a3814838b..b66a91ade 100644 --- a/webfrontend/pgm3/HISTORY +++ b/webfrontend/pgm3/HISTORY @@ -45,3 +45,6 @@ - Martin 2007-10-25 - design: userdef-gnuplot with transparent background (userdef.php) + +- Martin 2007-10-30 + - fix: gnuplot for FS20 now only off or on diff --git a/webfrontend/pgm3/include/gnuplot.php b/webfrontend/pgm3/include/gnuplot.php index bb3023f25..ae8f1512d 100644 --- a/webfrontend/pgm3/include/gnuplot.php +++ b/webfrontend/pgm3/include/gnuplot.php @@ -63,8 +63,9 @@ set noytics set noy2tics set yrange [-0.2:1.2] set ylabel "On/Off" -plot "< awk '{print $1, $3==\"on\"? 1 : $3==\"dimup\"? 0.8 : $3==\"dimdown\"? 0.2 : $3==\"off\"? 0 : 0.5;}' $logfile" using 1:2 title '' with steps +plot "< awk '{print $1, $3==\"on\"? 1 : $3==\"dimup\"? 1 : $3==\"dimdown\"? 0 : $3==\"off\"? 0 : 0.5;}' $logfile" using 1:2 title '' with steps EOD; +#plot "< awk '{print $1, $3==\"on\"? 1 : $3==\"dimup\"? 0.8 : $3==\"dimdown\"? 0.2 : $3==\"off\"? 0 : 0.5;}' $logfile" using 1:2 title '' with steps break; Case WS300_t1: ############################################ diff --git a/webfrontend/pgm3/index.php b/webfrontend/pgm3/index.php index d5b38e25a..9e7db4439 100644 --- a/webfrontend/pgm3/index.php +++ b/webfrontend/pgm3/index.php @@ -41,7 +41,7 @@ include "include/gnuplot.php"; include "include/functions.php"; -$pgm3version='071025'; +$pgm3version='071030'; $Action = $_POST['Action'];