Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

heard stations improvements

Browse source
This commit is contained in:
DJ2LS 2021-08-07 20:57:36 +02:00 committed by GitHub
parent 4d38df0ecd
commit ff0750442d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 99 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gui/main.js
View file

@ -98,6 +98,7 @@ ipcMain.on('request-update-tnc-state', (event, arg) => {
//data.webContents.send('action-update-tnc-state', arg);
});
/*
ipcMain.on('request-update-data-state', (event, arg) => {
//win.webContents.send('action-update-data-state', arg);
//data.webContents.send('action-update-data-state', arg);
@ -106,7 +107,7 @@ ipcMain.on('request-update-data-state', (event, arg) => {
ipcMain.on('request-update-heard-stations', (event, arg) => {
win.webContents.send('action-update-heard-stations', arg);
});
*/
ipcMain.on('request-update-daemon-state', (event, arg) => {
win.webContents.send('action-update-daemon-state', arg);
});

97
gui/preload-main.js
View file

@ -342,6 +342,98 @@ ipcRenderer.on('action-update-tnc-state', (event, arg) => {
// SET BANDWITH
document.getElementById("bandwith").innerHTML = arg.bandwith
// UPDATE HEARD STATIONS
//console.log(arg.stations)
//console.log(arg.stations[0]['DXGRID'])
var tbl = document.getElementById("heardstations");
document.getElementById("heardstations").innerHTML = ''
for (i = 0; i < arg.stations.length; i++) {
// first we update the PING window
console.log(document.getElementById("dxCall").value)
if (arg.stations[i]['DXCALLSIGN'] == document.getElementById("dxCall").value) {
document.getElementById("pingDistance").innerHTML = arg.stations[i]['DXGRID']
document.getElementById("pingDB").innerHTML = arg.stations[i]['SNR']
}
// now we update the heard stations list
var row = document.createElement("tr");
//https://stackoverflow.com/q/51421470
//https://stackoverflow.com/a/847196
timestampRaw = arg.stations[i]['TIMESTAMP']
var date = new Date(timestampRaw * 1000);
var hours = date.getHours();
var minutes = "0" + date.getMinutes();
var seconds = "0" + date.getSeconds();
var datetime = hours + ':' + minutes.substr(-2) + ':' + seconds.substr(-2);
var timestamp = document.createElement("td");
var timestampText = document.createElement('span');
timestampText.innerText = datetime
timestamp.appendChild(timestampText);
var dxCall = document.createElement("td");
var dxCallText = document.createElement('span');
dxCallText.innerText = arg.stations[i]['DXCALLSIGN']
dxCall.appendChild(dxCallText);
var dxGrid = document.createElement("td");
var dxGridText = document.createElement('span');
dxGridText.innerText = arg.stations[i]['DXGRID']
dxGrid.appendChild(dxGridText);
var dataType = document.createElement("td");
var dataTypeText = document.createElement('span');
dataTypeText.innerText = arg.stations[i]['DATATYPE']
dataType.appendChild(dataTypeText);
if(dataTypeText.innerText == 'CQ CQ CQ'){
row.classList.add("table-success");
}
if(dataTypeText.innerText == 'DATA-CHANNEL'){
row.classList.add("table-warning");
}
if(dataTypeText.innerText == 'BEACON'){
row.classList.add("table-light");
}
if(dataTypeText.innerText == 'PING'){
row.classList.add("table-info");
}
if(dataTypeText.innerText == 'PING-ACK'){
row.classList.add("table-primary");
}
var snr = document.createElement("td");
var snrText = document.createElement('span');
snrText.innerText = arg.stations[i]['SNR']
snr.appendChild(snrText);
row.appendChild(timestamp);
row.appendChild(dxCall);
row.appendChild(dxGrid);
row.appendChild(dataType);
row.appendChild(snr);
tbl.appendChild(row);
}
});
@ -438,6 +530,9 @@ ipcRenderer.on('action-update-daemon-connection', (event, arg) => {
});
/*
ipcRenderer.on('action-update-heard-stations', (event, arg) => {
//console.log(arg.stations)
//console.log(arg.stations[0]['DXGRID'])
@ -503,7 +598,7 @@ ipcRenderer.on('action-update-heard-stations', (event, arg) => {
}
});
*/

2
gui/sock.js
View file

@ -92,7 +92,7 @@ client.on('data', function(data) {
data = data.toString('utf8'); // convert data to string
msg += data.toString('utf8'); // append data to buffer so we can stick long data together
console.log(data)
//console.log(data)
// check if we reached an EOF, if true, clear buffer and parse JSON data
if (data.endsWith('"EOF": "EOF"}')) {
//console.log(msg)