projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9148b19
)
curve_formatting
author
Bernhard Tittelbach
<xro@realraum.at>
Thu, 17 Oct 2013 16:06:22 +0000
(16:06 +0000)
committer
Bernhard Tittelbach
<xro@realraum.at>
Thu, 17 Oct 2013 16:06:22 +0000
(16:06 +0000)
raspberry-kiosk/kiosk.js
patch
|
blob
|
history
diff --git
a/raspberry-kiosk/kiosk.js
b/raspberry-kiosk/kiosk.js
index
d506e1e
..
4a36fcb
100644
(file)
--- 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"],
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"],
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"],
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);
});
}
});
}