From 056fc174de644eaa9e387fa70638fc7caf784aec Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Fri, 1 Aug 2008 07:44:06 +0000
Subject: [PATCH] Small fixes / avg_month gnuplot

git-svn-id: https://svn.fhem.de/fhem/trunk@220 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/webfrontend/pgm2/98_SVG.pm     |  8 ++++++--
 fhem/webfrontend/pgm2/ks300_1.gplot |  2 ++
 fhem/webfrontend/pgm2/ks300_2.gplot |  2 ++
 fhem/webfrontend/pgm2/ks300_3.gplot |  4 ++--
 fhem/webfrontend/pgm2/ks300_4.gplot | 23 +++++++++++++++++++++++
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 fhem/webfrontend/pgm2/ks300_4.gplot

diff --git a/fhem/webfrontend/pgm2/98_SVG.pm b/fhem/webfrontend/pgm2/98_SVG.pm
index 079ec942b..fa39fe539 100755
--- a/fhem/webfrontend/pgm2/98_SVG.pm
+++ b/fhem/webfrontend/pgm2/98_SVG.pm
@@ -294,7 +294,7 @@ SVG_render($$$$$$$)
           pO "<polyline points=\"$ret\" class=\"l$idx\"/>\n";
         }
 
-    } elsif($type[$idx] eq "steps" ) {
+    } elsif($type[$idx] eq "steps" || $type[$idx] eq "fsteps" ) {
 
       if(@{$dxp} == 1) {
           my $y1 = $y+$h-($dyp->[0]-$min)*$hmul;
@@ -306,7 +306,11 @@ SVG_render($$$$$$$)
           my ($x2, $y2) = ($x+$dxp->[$i],   $y+$h-($dyp->[$i]  -$min)*$hmul);
           next if(int($x2) == $lx && int($y1) == $ly);
           $lx = int($x2); $ly = int($y2);
-          $ret .=  sprintf(" %d,%d %d,%d %d,%d", $x1,$y1, $x2,$y1, $x2,$y2);
+          if($type[$idx] eq "steps") {
+            $ret .=  sprintf(" %d,%d %d,%d %d,%d", $x1,$y1, $x2,$y1, $x2,$y2);
+          } else {
+            $ret .=  sprintf(" %d,%d %d,%d %d,%d", $x1,$y1, $x1,$y2, $x2,$y2);
+          }
         }
       }
       pO "<polyline points=\"$ret\" class=\"l$idx\"/>\n";
diff --git a/fhem/webfrontend/pgm2/ks300_1.gplot b/fhem/webfrontend/pgm2/ks300_1.gplot
index b451b0cef..87c38616a 100644
--- a/fhem/webfrontend/pgm2/ks300_1.gplot
+++ b/fhem/webfrontend/pgm2/ks300_1.gplot
@@ -2,6 +2,8 @@
 # Display the temperature and the humidity values of a KS300.
 # Corresponding FileLog definition:
 # define ks300log FileLog /var/log/fhem/ks300-%Y-%U.log ks300:.*H:.*
+#   or (SVG/gnuplot-scroll)
+# define ks300log FileLog /var/log/fhem/ks300-%Y.log ks300:.*H:.*
 
 set terminal png transparent size <SIZE> crop
 set output '<OUT>.png'
diff --git a/fhem/webfrontend/pgm2/ks300_2.gplot b/fhem/webfrontend/pgm2/ks300_2.gplot
index 148625695..45d9d6c00 100644
--- a/fhem/webfrontend/pgm2/ks300_2.gplot
+++ b/fhem/webfrontend/pgm2/ks300_2.gplot
@@ -2,6 +2,8 @@
 # Display the Wind and the Rain values of a KS300.
 # Corresponding FileLog definition:
 # define ks300log FileLog /var/log/fhem/ks300-%Y-%U.log ks300:.*H:.*
+#   or (SVG/gnuplot-scroll)
+# define ks300log FileLog /var/log/fhem/ks300-%Y.log ks300:.*H:.*
 
 set terminal png transparent size <SIZE> crop
 set output '<OUT>.png'
diff --git a/fhem/webfrontend/pgm2/ks300_3.gplot b/fhem/webfrontend/pgm2/ks300_3.gplot
index ce48b3a38..f5cc7d7c5 100644
--- a/fhem/webfrontend/pgm2/ks300_3.gplot
+++ b/fhem/webfrontend/pgm2/ks300_3.gplot
@@ -1,7 +1,7 @@
 ############################
-# Display the Temperature and the humidity values of a KS300.
+# Display the daily avarage temperature and rainfall from a KS300.
 # Corresponding FileLog definition:
-# define ks300log FileLog /var/log/fhem/ks300-%Y-%U.log ks300:.*H:.*
+# define avglog FileLog /var/log/fhem/ks300-%Y.log ks300:.*avg.*
 
 set terminal png transparent size <SIZE> crop
 set output '<OUT>.png'
diff --git a/fhem/webfrontend/pgm2/ks300_4.gplot b/fhem/webfrontend/pgm2/ks300_4.gplot
new file mode 100644
index 000000000..d3d893098
--- /dev/null
+++ b/fhem/webfrontend/pgm2/ks300_4.gplot
@@ -0,0 +1,23 @@
+############################
+# Display the monthly avarage temperature and rainfall from a KS300.
+# Corresponding FileLog definition:
+# define avglog FileLog /var/log/fhem/ks300-%Y.log ks300:.*avg.*
+
+set terminal png transparent size <SIZE> crop
+set output '<OUT>.png'
+set xdata time
+set timefmt "%Y-%m-%d_%H:%M:%S"
+set xlabel " "
+set ytics nomirror
+set y2tics
+set title '<TL>'
+set grid
+
+set ylabel "Temperature in C"
+set y2label "Rain (l/m2)"
+
+#FileLog 5:avg_month:0:
+#FileLog 11:avg_month:0:
+
+plot "<grep avg_month <IN>" using 1:5 axes x1y1 title 'Temperature' with lines,\
+     "<grep avg_month <IN>" using 1:11 axes x1y2 title 'Rain' with fsteps