From f8a0e21da4ce899dc590ab6076ae2d496ac09ae9 Mon Sep 17 00:00:00 2001
From: adam-abed-abud <aaadam94@gmail.com>
Date: Wed, 29 Apr 2020 09:13:26 +0200
Subject: [PATCH] Fix for charts xaxis diff time
---
raspberry-backend/static/js/Chart-display.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/raspberry-backend/static/js/Chart-display.js b/raspberry-backend/static/js/Chart-display.js
index 7b0bee1a..b19a3eff 100644
--- a/raspberry-backend/static/js/Chart-display.js
+++ b/raspberry-backend/static/js/Chart-display.js
@@ -51,7 +51,6 @@ function init_results(){
initial_yaxis_volume[i][0] = initial_yaxis_volume[i][0] - current_timestamp;
initial_yaxis_flow[i][0] = initial_yaxis_flow[i][0] - current_timestamp;
}
-
},
cache: false
});
@@ -99,14 +98,15 @@ function requestChartVar() {
//console.log(fio_reading);
fio_gauge.data.datasets[0].gaugeData['value'] = fio_reading;
- var seconds = point["timestamp"]/1000;
+ var seconds = point["timestamp"]/1000;
// get difference between last time stamp and this and apply to existing points
var diff = 0;
if ( current_timestamp == -1 ){
diff = seconds;
}
else {
- diff = seconds - current_timestamp;
+ //diff = seconds - current_timestamp; //FUTURE: restore this line in case not using simulated data
+ diff = 0.2;
}
current_timestamp = seconds;
@@ -125,7 +125,7 @@ function requestChartVar() {
initial_yaxis_pressure[i]['x'] = initial_yaxis_pressure[i]['x'] - diff;
initial_yaxis_volume[i]['x'] = initial_yaxis_volume[i]['x'] - diff;
initial_yaxis_flow[i]['x'] = initial_yaxis_flow[i]['x'] - diff;
- }
+ }
chart_pressure.data.datasets[0].data.push({x : 0, y : point["pressure_buffer"]});
chart_flow.data.datasets[0].data.push({ x : 0, y : point["temperature_buffer"]});
--
GitLab