From 20381b376051953a83039538952aead5415ccd72 Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Sun, 16 Oct 2016 18:30:47 +0200 Subject: [PATCH] kikupask --- main.js | 21 ++++++++++------ main.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 76 insertions(+), 21 deletions(-) diff --git a/main.js b/main.js index 8bdaa40..7624b94 100644 --- a/main.js +++ b/main.js @@ -1,33 +1,40 @@ console.log("bla") var gauge = document.getElementById('temp-gauge'); +var gauge2 = document.getElementById('temp-gauge2'); // Randomly add a data point every 500ms var random = new TimeSeries(); +var random2 = new TimeSeries(); setInterval(function() { fetch("/temps.json").then(function (resp) { return resp.json(); }).then(function (resp) { - console.log(resp) + console.log("resp: " + resp); var nr = Math.random() * 100; - nr = resp.pop() + var nr2 = Math.random() * 100; + nr = resp.pop(); + nr2 = resp.pop(); + console.log("nr: " + nr); random.append(new Date().getTime(), nr); + random2.append(new Date().getTime(), nr2); gauge.dataset.value = nr; + gauge2.dataset.value = nr2; }); }, 500); function createTimeline() { var chart = new SmoothieChart({grid:{fillStyle:'transparent'}, labels:{fillStyle:'#000000'}}); - chart.addTimeSeries(random, { strokeStyle: 'rgba(0, 0, 0, 1)', fillStyle: 'rgba(0, 0, 0, 0.1)', lineWidth: 4 }); + chart.addTimeSeries(random, { strokeStyle: 'rgba(0, 1, 0, 1)', fillStyle: 'rgba(0, 0, 0, 0.1)', lineWidth: 4 }); + chart.addTimeSeries(random2, { strokeStyle: 'rgba(0, 0, 1, 1)', fillStyle: 'rgba(0, 0, 0, 0.1)', lineWidth: 4 }); chart.streamTo(document.getElementById("chart"), 500); } fetch("/temps.json").then(function (resp) { return resp.json(); }).then(function (resp) { - console.log(resp) - for (val of resp) { - random.append(new Date().getTime(), val) - } + console.log("resp: " + resp); + random.append(new Date().getTime(), resp[0]); + random2.append(new Date().getTime(), resp[1]); }); function heat(h) { diff --git a/main.py b/main.py index 15d88a8..cd0dcb8 100644 --- a/main.py +++ b/main.py @@ -46,7 +46,7 @@ html = """ - Temperature + Jacket Temperature @@ -78,23 +78,33 @@ html = """ display: inline-block; }} + + + + + + + + + + + + -

Temperature

+
+

Jacket Temperature

+
+
-
-
-
- - - - -
- data-major-ticks="15,20,25,30,35" data-highlights="" id="temp-gauge"> -
-
- + + +
+ + + +
+ + + + + +
+
+ +
+
+ + + + + +
Source code, Good luck! +
+