From: Martin Mares <mj@ucw.cz>
Date: Fri, 20 Jan 2012 16:03:53 +0000 (+0100)
Subject: Home: Experimenting with new graph layout
X-Git-Tag: v1.2~6
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=9f54f7295c6f3f08ec5a691a9292551a5cd6ff13;p=arexx.git

Home: Experimenting with new graph layout
---

diff --git a/web/temp-12h.cgi b/web/temp-12h.cgi
index 710c33d..3e82db6 100755
--- a/web/temp-12h.cgi
+++ b/web/temp-12h.cgi
@@ -12,7 +12,16 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
-	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE1:a#0000cc:Ursarium\n' \
-	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:d#cc0000:Catarium\n' \
-	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:c#cc00cc:Balcony\n' \
-	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE1:b#00cc00:Outside'
+	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \
+	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE \
+	DEF:o=$D/sensor-outside.rrd:temp:AVERAGE \
+	'AREA:c#cc7777' \
+	'AREA:u#7777cc' \
+	'AREA:b#cc77cc' \
+	'AREA:o#77cc77' \
+	'LINE2:c#cc0000:Catarium\n' \
+	'LINE2:u#0000cc:Ursarium\n' \
+	'LINE2:b#cc00cc:Balcony\n' \
+	'LINE2:o#00cc00:Outside' \
+	'HRULE:0#0000ff'
diff --git a/web/temp-48h.cgi b/web/temp-48h.cgi
index 9613985..e704c60 100755
--- a/web/temp-48h.cgi
+++ b/web/temp-48h.cgi
@@ -12,7 +12,16 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
-	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE1:a#0000cc:Ursarium\n' \
-	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:d#cc0000:Catarium\n' \
-	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:c#cc00cc:Balcony\n' \
-	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE1:b#00cc00:Outside'
+	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \
+	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE \
+	DEF:o=$D/sensor-outside.rrd:temp:AVERAGE \
+	'AREA:c#cc7777' \
+	'AREA:u#7777cc' \
+	'AREA:b#cc77cc' \
+	'AREA:o#77cc77' \
+	'LINE2:c#cc0000:Catarium\n' \
+	'LINE2:u#0000cc:Ursarium\n' \
+	'LINE2:b#cc00cc:Balcony\n' \
+	'LINE2:o#00cc00:Outside' \
+	'HRULE:0#0000ff'
diff --git a/web/temp-month.cgi b/web/temp-month.cgi
index 76058aa..3b409df 100755
--- a/web/temp-month.cgi
+++ b/web/temp-month.cgi
@@ -12,11 +12,12 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
-	DEF:alo=$D/sensor-ursarium.rrd:temp:MIN 'LINE1:alo#0000cc:Ursarium\n' \
-	DEF:ahi=$D/sensor-ursarium.rrd:temp:MAX 'LINE1:ahi#0000cc' \
-	DEF:dlo=$D/sensor-catarium.rrd:temp:MIN 'LINE1:dlo#cc0000:Catarium\n' \
-	DEF:dhi=$D/sensor-catarium.rrd:temp:MAX 'LINE1:dhi#cc0000' \
-	DEF:clo=$D/sensor-balcony.rrd:temp:MIN 'LINE1:clo#cc00cc:Balcony\n' \
-	DEF:chi=$D/sensor-balcony.rrd:temp:MAX 'LINE1:chi#cc00cc' \
-	DEF:blo=$D/sensor-outside.rrd:temp:MIN 'LINE1:blo#00cc00:Outside' \
-	DEF:bhi=$D/sensor-outside.rrd:temp:MAX 'LINE1:bhi#00cc00'
+	DEF:alo=$D/sensor-ursarium.rrd:temp:MIN 'LINE2:alo#0000cc:Ursarium\n' \
+	DEF:ahi=$D/sensor-ursarium.rrd:temp:MAX 'LINE2:ahi#0000cc' \
+	DEF:dlo=$D/sensor-catarium.rrd:temp:MIN 'LINE2:dlo#cc0000:Catarium\n' \
+	DEF:dhi=$D/sensor-catarium.rrd:temp:MAX 'LINE2:dhi#cc0000' \
+	DEF:clo=$D/sensor-balcony.rrd:temp:MIN 'LINE2:clo#cc00cc:Balcony\n' \
+	DEF:chi=$D/sensor-balcony.rrd:temp:MAX 'LINE2:chi#cc00cc' \
+	DEF:blo=$D/sensor-outside.rrd:temp:MIN 'LINE2:blo#00cc00:Outside' \
+	DEF:bhi=$D/sensor-outside.rrd:temp:MAX 'LINE2:bhi#00cc00' \
+	'HRULE:0#0000ff'
diff --git a/web/temp-quick.cgi b/web/temp-quick.cgi
index 2c55dd4..970957b 100755
--- a/web/temp-quick.cgi
+++ b/web/temp-quick.cgi
@@ -12,7 +12,8 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
-	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE1:a#0000cc:Ursarium\n' \
-	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:d#cc0000:Catarium\n' \
-	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:c#cc00cc:Balcony\n' \
-	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE1:b#00cc00:Outside'
+	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE2:a#0000cc:Ursarium\n' \
+	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE2:d#cc0000:Catarium\n' \
+	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE2:c#cc00cc:Balcony\n' \
+	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE2:b#00cc00:Outside' \
+	'HRULE:0#0000ff'