tvolkmann/gyrogpsc
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Wiki Activity

adds speed chart for serial and tcp

Browse Source
This commit is contained in:
unknown 2021-01-05 12:56:34 +01:00
parent 7805e89f5f
commit acee3f9465
4 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
static/scripts/chart.js
View File

@ -12,16 +12,6 @@ var myChart = new Chart(ctx, {
pointRadius: 0, pointRadius: 0,
lineTension: 0.5, lineTension: 0.5,
data: new Array(GRAPH_RES) data: new Array(GRAPH_RES)
},
{
label: 'Smartphone',
backgroundColor: 'rgba(30, 139, 195, 1)',
borderColor: 'rgba(30, 139, 195, 1)',
borderWidth: 1,
fill: false,
pointRadius: 0,
lineTension: 0.5,
data: new Array(GRAPH_RES)
}] }]
}, },
options: { options: {

44
static/scripts/chartfull.js
View File

@ -1,3 +1,6 @@
var arrayTCP = [];
var arraySERIAL = [];
var ctx = document.getElementById('myChart').getContext('2d'); var ctx = document.getElementById('myChart').getContext('2d');
var myChart = new Chart(ctx, { var myChart = new Chart(ctx, {
type: 'line', type: 'line',
@ -11,7 +14,7 @@ var myChart = new Chart(ctx, {
fill: false, fill: false,
pointRadius: 0, pointRadius: 0,
lineTension: 0.5, lineTension: 0.5,
data: new Array() data: arraySERIAL
}, },
{ {
label: 'Smartphone', label: 'Smartphone',
@ -21,7 +24,7 @@ var myChart = new Chart(ctx, {
fill: false, fill: false,
pointRadius: 0, pointRadius: 0,
lineTension: 0.5, lineTension: 0.5,
data: new Array() data: arrayTCP
}] }]
}, },
options: { options: {
@ -31,6 +34,13 @@ var myChart = new Chart(ctx, {
min: 0, min: 0,
max: 250 max: 250
} }
}],
xAxes: [{
ticks: {
min: 0,
max: 25
},
stepSize: 1
}] }]
}, },
animation: { animation: {
@ -38,33 +48,36 @@ var myChart = new Chart(ctx, {
} }
} }
}); });
myChart.data.labels.fill("", 0, GRAPH_RES); //myChart.data.labels.fill("", 0, GRAPH_RES);
myChart.data.datasets.forEach((dataset) => dataset.data.fill(0, 0, GRAPH_RES)) //myChart.data.datasets.forEach((dataset) => dataset.data.fill(0, 0, GRAPH_RES))
function addSerialSpeedData(sensordataList) { function addSerialSpeedData(sensordataList) {
let speedsSerial = [] let speedsSerial = []
let times = []
sensordataList.forEach(sensordata => { sensordataList.forEach(sensordata => {
if (sensordata.Speed === 0) { if (sensordata.Speed === 0) {
return; return;
} }
let speed = sensordata.Speed let speed = sensordata.Speed
speedsSerial.push(speed); speedsSerial.push(speed);
let time = sensordata.Servertime
times.push(time)
}) })
myChart.data.labels.push(""); myChart.data.labels = times;
myChart.data.datasets[0].data.push(speedsSerial); myChart.data.datasets[0].data = speedsSerial;
while (myChart.data.labels.length >= GRAPH_RES) { /*while (myChart.data.labels.length >= GRAPH_RES) {
myChart.data.labels.shift(); myChart.data.labels.shift();
myChart.data.datasets.forEach((dataset) => dataset.data.shift()) myChart.data.datasets.forEach((dataset) => dataset.data.shift())
} }*/
myChart.update(); myChart.update();
}; };
function addTCPSpeedData(data) { function addTCPSpeedData(sensordataList) {
let speedsTCP = [] let speedsTCP = []
let times = []
sensordataList.forEach(sensordata => { sensordataList.forEach(sensordata => {
if (sensordata.Speed === 0) { if (sensordata.Speed === 0) {
@ -72,15 +85,16 @@ function addTCPSpeedData(data) {
} }
let speed = sensordata.Speed let speed = sensordata.Speed
speedsTCP.push(speed); speedsTCP.push(speed);
let time = sensordata.Servertime
times.push(time)
}) })
//myChart.data.labels = times;
myChart.data.datasets[1].data = speedsTCP;
myChart.data.labels.push(""); /*while (myChart.data.labels.length >= GRAPH_RES) {
myChart.data.datasets[1].data.push(speedsTCP);
while (myChart.data.labels.length >= GRAPH_RES) {
myChart.data.labels.shift(); myChart.data.labels.shift();
myChart.data.datasets.forEach((dataset) => dataset.data.shift()) myChart.data.datasets.forEach((dataset) => dataset.data.shift())
} }*/
myChart.update(); myChart.update();
}; };

2
static/scripts/refull.js
View File

@ -33,7 +33,7 @@ window.addEventListener("load", function(evt) {
fetch(`http://localhost:3011/trackings/${trackings[sel.selectedIndex].UUID}`, { method: 'GET'}).then(results => { fetch(`http://localhost:3011/trackings/${trackings[sel.selectedIndex].UUID}`, { method: 'GET'}).then(results => {
return results.json() return results.json()
}).then(r => { }).then(r => {
// console.log(r.data.Data) console.log(r.data.Data)
console.log(r.data) console.log(r.data)
if ('SOURCE_TCP' in r.data.Data && r.data.Data.SOURCE_TCP.length > 0) { if ('SOURCE_TCP' in r.data.Data && r.data.Data.SOURCE_TCP.length > 0) {
updateMapTCPbulk(r.data.Data.SOURCE_TCP) updateMapTCPbulk(r.data.Data.SOURCE_TCP)

10
static/scripts/websocket.js
View File

@ -78,9 +78,15 @@ window.addEventListener("load", function(evt) {
console.log("no data to compare") console.log("no data to compare")
} }
if(!(dat.SOURCE_SERIAL.Position[2] === 0)){ try{
addSerialAltData(dat.SOURCE_SERIAL.Position[2]) if(!(dat.SOURCE_SERIAL.Position[2] === 0)){
addSerialAltData(dat.SOURCE_SERIAL.Position[2])
}
} }
catch{
console.log("no data")
}
/* /*