Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/liveview.php	Sun Aug 24 23:01:32 2014 +0200
+++ b/www-thermferm/liveview.php	Mon Aug 25 20:47:30 2014 +0200
@@ -107,15 +107,15 @@
 	$outstr .= '       {'.PHP_EOL;
 	$outstr .= '          datatype: "json",'.PHP_EOL;
 	$outstr .= '          datafields: ['.PHP_EOL;
-	$outstr .= '             { name: \'Date\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Mode\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Air\', type: \'float\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Beer\', type: \'float\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Target\', type: \'float\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Heater\', type: \'bool\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Cooler\', type: \'int\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Fan\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Door\', type: \'bool\' }'.PHP_EOL;
+	$outstr .= '             { name: "Date" },'.PHP_EOL;
+	$outstr .= '             { name: "Mode" },'.PHP_EOL;
+	$outstr .= '             { name: "Air", type: "float" },'.PHP_EOL;
+	$outstr .= '             { name: "Beer", type: "float" },'.PHP_EOL;
+	$outstr .= '             { name: "Target", type: "float" },'.PHP_EOL;
+	$outstr .= '             { name: "Heater", type: "int" },'.PHP_EOL;
+	$outstr .= '             { name: "Cooler", type: "int" },'.PHP_EOL;
+	$outstr .= '             { name: "Fan", type: "int" },'.PHP_EOL;
+	$outstr .= '             { name: "Door", type: "int" }'.PHP_EOL;
 	$outstr .= '          ],'.PHP_EOL;
 	$outstr .= '          url: \'getlog.php?unit='.$unit.'\''.PHP_EOL;
 	$outstr .= '       };'.PHP_EOL;
@@ -144,18 +144,34 @@
 	$outstr .= '         colorScheme: \'scheme01\','.PHP_EOL;
 	$outstr .= '         seriesGroups:'.PHP_EOL;
 	$outstr .= '           [{'.PHP_EOL;
-	$outstr .= '             type: \'line\','.PHP_EOL;
+	$outstr .= '             type: "stepline",'.PHP_EOL;
 	$outstr .= '             columnsGapPercent: 30,'.PHP_EOL;
 	$outstr .= '             seriesGapPercent: 0,'.PHP_EOL;
 	$outstr .= '             valueAxis:'.PHP_EOL;
 	$outstr .= '             {'.PHP_EOL;
+	$outstr .= '               minValue: 0,'.PHP_EOL;
+	$outstr .= '               maxValue: 4,'.PHP_EOL;
+	$outstr .= '               displayValueAxis: false,'.PHP_EOL;
+	$outstr .= '               description: "Heat/Cool"'.PHP_EOL;
+	$outstr .= '             },'.PHP_EOL;
+	$outstr .= '             series: ['.PHP_EOL;
+	$outstr .= '               { dataField: "Cooler", displayText: "Cool", opacity: 0.5 },'.PHP_EOL;
+	$outstr .= '               { dataField: "Heater", displayText: "Heat", opacity: 0.5 }'.PHP_EOL;
+	$outstr .= '             ]'.PHP_EOL;
+	$outstr .= '            },'.PHP_EOL;
+	$outstr .= '            {'.PHP_EOL;
+	$outstr .= '             type: \'spline\','.PHP_EOL;
+	$outstr .= '             columnsGapPercent: 30,'.PHP_EOL;
+	$outstr .= '             seriesGapPercent: 0,'.PHP_EOL;
+	$outstr .= '             valueAxis:'.PHP_EOL;
+	$outstr .= '             {'.PHP_EOL;
+	$outstr .= '               minValue: 0,'.PHP_EOL;
 	$outstr .= '               description: \'Degrees C\''.PHP_EOL;
 	$outstr .= '             },'.PHP_EOL;
 	$outstr .= '             series: ['.PHP_EOL;
-	$outstr .= '               { dataField: \'Air\', displayText: \'Air\' },'.PHP_EOL;
-	$outstr .= '               { dataField: \'Beer\', displayText: \'Beer\' },'.PHP_EOL;
-	$outstr .= '               { dataField: \'Heater\', displayText: \'Heater\' },'.PHP_EOL;
-	$outstr .= '               { dataField: \'Target\', displayText: \'Target\' }'.PHP_EOL;
+	$outstr .= '               { dataField: "Air", displayText: "Air" },'.PHP_EOL;
+	$outstr .= '               { dataField: "Beer", displayText: "Beer" },'.PHP_EOL;
+	$outstr .= '               { dataField: "Target", displayText: "Target", opacity: 0.7 }'.PHP_EOL;
 	$outstr .= '             ]'.PHP_EOL;
 	$outstr .= '           }]'.PHP_EOL;
 	$outstr .= '       };'.PHP_EOL;