diff --git a/static/scripts/accuracy.js b/static/scripts/accuracy.js new file mode 100644 index 0000000..78fed15 --- /dev/null +++ b/static/scripts/accuracy.js @@ -0,0 +1,44 @@ +var ctx = document.getElementById("accuracy").getContext('2d'); +var barChart = new Chart(ctx, { + type: 'horizontalBar', + data: { + labels: ["Horizontal Acc.", "Vertical Acc."], + datasets: [{ + label: 'Ublox', + data: [0, 0], + backgroundColor: "rgba(214, 69, 65, 1)" + }, { + label: 'Smartphone', + data: [0, 0], + backgroundColor: "rgba(30, 139, 195, 1)" + }] + }, + options: { + scales: { + xAxes: [{ + ticks: { + min: 0, + max: 10 + } + }] + }, + legend: { + display: true, + enabled: true + }, + tooltips: { + enabled: false, + display: false + } + } +}); + +function addSerialAccuracy(hacc, vacc){ + barChart.data.datasets[0].data = [hacc, vacc]; + barChart.update(); +} + +function addTCPAccuracy(hacc, vacc){ + barChart.data.datasets[1].data = [hacc, vacc]; + barChart.update(); +} diff --git a/static/scripts/chartfull.js b/static/scripts/chartfull.js index 8127683..a9f5ecf 100644 --- a/static/scripts/chartfull.js +++ b/static/scripts/chartfull.js @@ -36,11 +36,10 @@ var myChart = new Chart(ctx, { } }], xAxes: [{ - ticks: { - min: 0, - max: 25 - }, - stepSize: 1 + type: 'time', + time: { + unit: 'second' + } }] }, animation: { @@ -51,15 +50,15 @@ var myChart = new Chart(ctx, { //myChart.data.labels.fill("", 0, GRAPH_RES); //myChart.data.datasets.forEach((dataset) => dataset.data.fill(0, 0, GRAPH_RES)) -function addSerialSpeedData(sensordataList) { +function addSerialSpeedData(serialdataList, tcpdataList) { let speedsSerial = [] let times = [] - sensordataList.forEach(sensordata => { + serialdataList.forEach(sensordata => { if (sensordata.Speed === 0) { return; } let speed = sensordata.Speed - speedsSerial.push(speed); + speedsSerial.push(speed * 3.6, timestamp); let time = sensordata.Servertime times.push(time) diff --git a/static/scripts/refull.js b/static/scripts/refull.js index b2976a6..d66f83d 100644 --- a/static/scripts/refull.js +++ b/static/scripts/refull.js @@ -41,7 +41,7 @@ window.addEventListener("load", function(evt) { } if ('SOURCE_SERIAL' in r.data.Data && r.data.Data.SOURCE_SERIAL.length > 0) { updateMapSERIALbulk(r.data.Data.SOURCE_SERIAL) - addSerialSpeedData(r.data.Data.SOURCE_SERIAL) + addSerialSpeedData(r.data.Data.SOURCE_SERIAL, r.data.Data.SOURCE_TCP) } }) diff --git a/static/scripts/websocket.js b/static/scripts/websocket.js index 556cd48..536da12 100644 --- a/static/scripts/websocket.js +++ b/static/scripts/websocket.js @@ -84,7 +84,29 @@ window.addEventListener("load", function(evt) { } } catch{ - console.log("no data") + console.log("no altitude data") + } + try{ + if(!(dat.SOURCE_SERIAL.HAcc === 0) && !(dat.SOURCE_SERIAL.VAcc === 0)){ + addSerialAccuracy(dat.SOURCE_SERIAL.HAcc, dat.SOURCE_SERIAL.VAcc) + document.getElementById("serialHAcc").innerHTML = "Ublox HAcc: " + dat.SOURCE_SERIAL.HAcc.toFixed(2) + " m" + document.getElementById("serialVAcc").innerHTML = "Ublox VAcc: " + dat.SOURCE_SERIAL.VAcc.toFixed(2) + " m" + console.log("acc: " + dat.SOURCE_SERIAL.HAcc, dat.SOURCE_SERIAL.VAcc) + } + } + catch{ + console.log("no Serial acc") + } + try{ + if(!(dat.SOURCE_TCP.HAcc === 0) && !(dat.SOURCE_TCP.VAcc === 0)){ + addTCPAccuracy(dat.SOURCE_TCP.HAcc, dat.SOURCE_TCP.VAcc) + document.getElementById("tcpHAcc").innerHTML = "Smartphone HAcc: " + dat.SOURCE_TCP.HAcc.toFixed(2) + " m" + document.getElementById("tcpVAcc").innerHTML = "Smartphone VAcc: " + dat.SOURCE_TCP.VAcc.toFixed(2) + " m" + console.log("acc: " + dat.SOURCE_TCP.HAcc, dat.SOURCE_TCP.VAcc) + } + } + catch{ + console.log("no TCP acc") } diff --git a/templates/index.html b/templates/index.html index c3cc0bf..4f5aa6f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -57,6 +57,27 @@
Smartphone