diff --git a/static/scripts/accuracy.js b/static/scripts/accuracy.js index df903fa..b8570a7 100644 --- a/static/scripts/accuracy.js +++ b/static/scripts/accuracy.js @@ -2,14 +2,18 @@ var ctx = document.getElementById("accuracy").getContext('2d'); var barChart = new Chart(ctx, { type: 'horizontalBar', data: { - labels: ["Meters"], + labels: ["HAcc", "VAcc", "Dist"], datasets: [{ - label: 'Ublox Horizontal acc.', + label: 'Ublox', data: [0, 0], backgroundColor: "rgba(214, 69, 65, 1)" }, { - label: 'Dist. Ublox-Smartphone', + label: 'Smartphone', data: [0, 0], + backgroundColor: "rgba(30, 139, 195, 1)" + }, { + label: 'Dist. Ublox-Smartphone', + data: [0], backgroundColor: "rgba(30, 139, 0, 1)" }] }, @@ -33,15 +37,15 @@ var barChart = new Chart(ctx, { } }); -function addSerialAccuracy(hacc){ - barChart.data.datasets[0].data = [hacc]; +function addSerialAccuracy(hacc, vacc){ + barChart.data.datasets[0].data = [hacc, vacc]; barChart.update(); } -/*function addTCPAccuracy(hacc, vacc){ +function addTCPAccuracy(hacc, vacc){ barChart.data.datasets[1].data = [hacc, vacc]; barChart.update(); -}*/ +} function addDistanceToBarChart(dist){ barChart.data.datasets[1].data = [dist]; diff --git a/static/scripts/websocket.js b/static/scripts/websocket.js index 0771c2f..5636cae 100644 --- a/static/scripts/websocket.js +++ b/static/scripts/websocket.js @@ -136,9 +136,9 @@ window.addEventListener("load", function(evt) { try{ if(!(dat.SOURCE_SERIAL.HAcc === 0) && !(dat.SOURCE_SERIAL.VAcc === 0)){ - addSerialAccuracy(dat.SOURCE_SERIAL.HAcc) + addSerialAccuracy(dat.SOURCE_SERIAL.HAcc, dat.SOURCE_SERIAL.VAcc) document.getElementById("serialHAcc").innerHTML = "Ublox HAcc: " + dat.SOURCE_SERIAL.HAcc.toFixed(3) + " m" - //document.getElementById("serialVAcc").innerHTML = "Ublox VAcc: " + dat.SOURCE_SERIAL.VAcc.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) } } @@ -146,7 +146,7 @@ window.addEventListener("load", function(evt) { // console.log("no Serial acc") } - /*try{ + 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 = "Phone HAcc: " + dat.SOURCE_TCP.HAcc.toFixed(2) + " m" @@ -156,7 +156,7 @@ window.addEventListener("load", function(evt) { } catch{ console.log("no TCP acc") - }*/ + } } const wsOnOpenF = function (evt) { diff --git a/templates/index.html b/templates/index.html index f30d009..f9ccd9e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -103,21 +103,21 @@
- - + HAcc: - + VAcc:
+ +