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

add smartphone accuracy data to chart again

Browse Source
This commit is contained in:
unknown 2021-01-11 10:47:08 +01:00
parent 917632b964
commit da5e98870f
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
static/scripts/accuracy.js
View File

@ -2,14 +2,18 @@ var ctx = document.getElementById("accuracy").getContext('2d');
var barChart = new Chart(ctx, { var barChart = new Chart(ctx, {
type: 'horizontalBar', type: 'horizontalBar',
data: { data: {
labels: ["Meters"], labels: ["HAcc", "VAcc", "Dist"],
datasets: [{ datasets: [{
label: 'Ublox Horizontal acc.', label: 'Ublox',
data: [0, 0], data: [0, 0],
backgroundColor: "rgba(214, 69, 65, 1)" backgroundColor: "rgba(214, 69, 65, 1)"
}, { }, {
label: 'Dist. Ublox-Smartphone', label: 'Smartphone',
data: [0, 0], data: [0, 0],
backgroundColor: "rgba(30, 139, 195, 1)"
}, {
label: 'Dist. Ublox-Smartphone',
data: [0],
backgroundColor: "rgba(30, 139, 0, 1)" backgroundColor: "rgba(30, 139, 0, 1)"
}] }]
}, },
@ -33,15 +37,15 @@ var barChart = new Chart(ctx, {
} }
}); });
function addSerialAccuracy(hacc){ function addSerialAccuracy(hacc, vacc){
barChart.data.datasets[0].data = [hacc]; barChart.data.datasets[0].data = [hacc, vacc];
barChart.update(); barChart.update();
} }
/*function addTCPAccuracy(hacc, vacc){ function addTCPAccuracy(hacc, vacc){
barChart.data.datasets[1].data = [hacc, vacc]; barChart.data.datasets[1].data = [hacc, vacc];
barChart.update(); barChart.update();
}*/ }
function addDistanceToBarChart(dist){ function addDistanceToBarChart(dist){
barChart.data.datasets[1].data = [dist]; barChart.data.datasets[1].data = [dist];

8
static/scripts/websocket.js
View File

@ -136,9 +136,9 @@ window.addEventListener("load", function(evt) {
try{ try{
if(!(dat.SOURCE_SERIAL.HAcc === 0) && !(dat.SOURCE_SERIAL.VAcc === 0)){ 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("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) //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") // console.log("no Serial acc")
} }
/*try{ try{
if(!(dat.SOURCE_TCP.HAcc === 0) && !(dat.SOURCE_TCP.VAcc === 0)){ if(!(dat.SOURCE_TCP.HAcc === 0) && !(dat.SOURCE_TCP.VAcc === 0)){
addTCPAccuracy(dat.SOURCE_TCP.HAcc, dat.SOURCE_TCP.VAcc) addTCPAccuracy(dat.SOURCE_TCP.HAcc, dat.SOURCE_TCP.VAcc)
document.getElementById("tcpHAcc").innerHTML = "Phone HAcc: " + dat.SOURCE_TCP.HAcc.toFixed(2) + " m" document.getElementById("tcpHAcc").innerHTML = "Phone HAcc: " + dat.SOURCE_TCP.HAcc.toFixed(2) + " m"
@ -156,7 +156,7 @@ window.addEventListener("load", function(evt) {
} }
catch{ catch{
console.log("no TCP acc") console.log("no TCP acc")
}*/ }
} }
const wsOnOpenF = function (evt) { const wsOnOpenF = function (evt) {

16
templates/index.html
View File

@ -103,21 +103,21 @@
<label id="serialHAcc" <label id="serialHAcc"
style="color: rgba(214, 69, 65, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Ublox style="color: rgba(214, 69, 65, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Ublox
HAcc: </label><br> HAcc: </label><br>
<label id="distance" <label id="tcpHAcc"
style="color: rgba(30, 139, 0, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">
Distance: </label>
<!--<label id="tcpHAcc"
style="color: rgba(30, 139, 195, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Phone style="color: rgba(30, 139, 195, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Phone
HAcc: </label>--> HAcc: </label>
</div> </div>
<!--<div class="container" style="width: 150px; height: 50px"> <div class="container" style="width: 150px; height: 50px">
<label id="serialVAcc" <label id="serialVAcc"
style="color: rgba(214, 69, 65, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Ublox style="color: rgba(214, 69, 65, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Ublox
VAcc: </label><br> VAcc: </label><br>
<label id="tcpVAcc" <label id="tcpVAcc"
style="color: rgba(30, 139, 195, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Phone style="color: rgba(30, 139, 195, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">Phone
VAcc: </label> VAcc: </label><br>
</div>--> <label id="distance"
style="color: rgba(30, 139, 0, 1); font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif">
Distance: </label>
</div>
</div> </div>
</div> </div>
</div> </div>