From: Bernhard Tittelbach Date: Thu, 17 Oct 2013 16:06:22 +0000 (+0000) Subject: curve_formatting X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=cbae74009cf269a5ca260e5e67de6ab35b5ae95d;p=svn42.git curve_formatting --- diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js index d506e1e..4a36fcb 100644 --- a/raspberry-kiosk/kiosk.js +++ b/raspberry-kiosk/kiosk.js @@ -207,11 +207,11 @@ function drawLineGraph(targetelem, dataarray, options, x_is_epochdate) { function loadAndDrawSensorData() { $.getJSON("https://realraum.at/shmcache/r3sensors.json", function(data){ drawLineGraph(document.getElementById('tempgooglegraph'), data["TempSensorUpdate"], - {curveType: "function", title: 'Temperature Sensors', colors: ['#FF0000','#CC0033','#660000','#CC3333'], chartArea:{left:32,top:20,width:"88%",height:"83%"}, legend: {position: "none"}} ,true); + {curveType: "function", title: 'Temperature Sensors', colors: ['#FF0000','#CC0033','#660000','#CC3333'], vAxis:{viewWindow:{min:15,max:26}, viewWindowMode:"explicit"}, chartArea:{left:32,top:20,width:"88%",height:"78%"}, legend: {position: "none"}} ,true); drawLineGraph(document.getElementById('lightgooglegraph'), data["IlluminationSensorUpdate"], - {curveType: "none", title: 'Illumination Sensors', vAxis: {maxValue: 1024, minValue:5}, chartArea:{left:32,top:20,width:"88%",height:"83%"}, legend: {position: "none"}} ,true); + {curveType: "none", title: 'Illumination Sensors', vAxis: {maxValue: 1024, minValue:5}, chartArea:{left:32,top:20,width:"88%",height:"78%"}, legend: {position: "none"}} ,true); drawLineGraph(document.getElementById('movementgooglegraph'), data["MovementSensorUpdate"], - {curveType: "function", title: 'Movement Sensors', vAxis: {maxValue: 10, minValue:0}, chartArea:{left:32,top:20,width:"88%",height:"83%"}, legend: {position: "none"}} ,true); + {curveType: "function", title: 'Movement Sensors', vAxis: {maxValue: 10, minValue:0,viewWindowMode:"maximized"}, chartArea:{left:32,top:20,width:"88%",height:"78%"}, legend: {position: "none"}} ,true); }); }