mirror
/
radiosonde_auto_rx
kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #758 from darksidelemm/testing 

Only update scan plot when tab is visible, and scan plot is open. May…
pull/763/head^2
Mark Jessop 2023-03-11 10:26:09 +10:30 zatwierdzone przez GitHub
rodzic c24cb217e4 a70ece4dee
commit 4899a0121a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
5 zmienionych plików z 114 dodań i 89 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
auto_rx/autorx/__init__.py
Wyświetl plik

@ -12,7 +12,7 @@ from queue import Queue
# MINOR - New sonde type support, other fairly big changes that may result in telemetry or config file incompatability issus.
# PATCH - Small changes, or minor feature additions.
__version__ = "1.6.1-beta1"
__version__ = "1.6.1-beta2"
# Global Variables

34
auto_rx/autorx/static/js/scan_chart.js
Wyświetl plik

@ -4,6 +4,7 @@ var scan_chart_spectra;
var scan_chart_peaks;
var scan_chart_threshold;
var scan_chart_obj;
var scan_chart_latest_timestamp;
function setup_scan_chart(){
scan_chart_spectra = {
@ -64,4 +65,37 @@ function setup_scan_chart(){
},
point:{r:10}
});
}
function redraw_scan_chart(){
// Plot the updated data.
scan_chart_obj.load(scan_chart_spectra);
scan_chart_obj.load(scan_chart_peaks);
scan_chart_obj.load(scan_chart_threshold);
console.log("Scan plot redraw - " + scan_chart_latest_timestamp);
// Run dark mode check again to solve render issues.
var z = getCookie('dark');
if (z == 'true') {
changeTheme(true);
} else if (z == 'false') {
changeTheme(false);
} else if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
changeTheme(true);
} else {
changeTheme(false);
}
// Show the latest scan time.
if (getCookie('UTC') == 'false') {
temp_date = scan_chart_latest_timestamp;
temp_date = temp_date.slice(0, -3);
temp_date += "Z";
var date = new Date(temp_date);
var date_converted = date.toLocaleString(window.navigator.language,{hourCycle:'h23', year:"numeric", month:"2-digit", day:'2-digit', hour:'2-digit',minute:'2-digit', second:'2-digit'});
$('#scan_results').html('<b>Latest Scan:</b> ' + date_converted);
} else {
$('#scan_results').html('<b>Latest Scan:</b> ' + (scan_chart_latest_timestamp.slice(0, -3) + 'Z').replace("T", " ").replace("Z", "").slice(0, -4) + ' UTC');
}
}

3
auto_rx/autorx/static/js/utils.js
Wyświetl plik

@ -79,4 +79,5 @@ function calculate_lookangles(a, b) {
'range': distance,
'bearing': str_bearing
};
}
}

9
auto_rx/autorx/templates/historical.html
Wyświetl plik

@ -1438,6 +1438,7 @@
document.documentElement.style.setProperty('--vh', `${vh}px`);
</script>
</head>
<body>
@ -1499,14 +1500,14 @@
<label> Serial</label><br>
<input type="checkbox" class="3" id="checkbox3" checked>
<label> Frequency</label><br>
<input type="checkbox" class="4" id="checkbox4" checked>
<input type="checkbox" class="4" id="checkbox4">
<label> Count</label><br>
<input type="checkbox" class="5" id="checkbox5" checked>
<label> Last H</label><br>
<label> Last Height</label><br>
<input type="checkbox" class="6" id="checkbox6" checked>
<label> Last R</label><br>
<label> Last Range</label><br>
<input type="checkbox" class="7" id="checkbox7" checked>
<label> Max R</label><br>
<label> Max Range</label><br>
</form>
</div>
<div id="downdiv">

155
auto_rx/autorx/templates/index.html
Wyświetl plik

@ -40,6 +40,63 @@
var sonde_currently_following = "none";
// Function to change CSS options when changing dark mode.
function changeTheme(dark) {
if (dark == false) {
document.body.style.background = 'white';
if (document.getElementById("log-tray").style.color == "rgb(255, 0, 0)") {
$('#main span').css('color', 'black')
$('#log-tray').css('color', 'red');
} else {
$('#main span').css('color', 'black')
}
$('#main p').css('color', 'black')
$('.modal-content p').css('color', 'black')
$('.modal-content h2').css('color', 'black')
$('.modal-content span').css('color', 'black')
$('.modal-content').css('background-color', 'white')
$('.close').css('color', 'black')
$('#myBtn1').css('color', 'black')
$('#myBtn2').css('color', 'black')
$('#scanid').css('color', 'black')
$('.c3-axis-y').css('fill', 'black')
$('.c3-axis-x').css('fill', 'black')
$('.c3-legend-item text').css('fill', 'black')
$('.domain').css('stroke', 'black')
$('.tick line').css('stroke', 'black')
$('#mapid span').css('color', 'black')
$('.sidenav').css('background-color', '#111')
$('.settings').css('background-color', '#111')
$('#tabulatorsheet').attr('href', '{{ url_for("static", filename="css/tabulator_simple.min.css") }}');
} else {
document.body.style.background = '#121212';
if (document.getElementById("log-tray").style.color == "rgb(255, 0, 0)") {
$('#main span').css('color', 'white')
$('#log-tray').css('color', 'red');
} else {
$('#main span').css('color', 'white')
}
$('#main p').css('color', 'white')
$('.modal-content p').css('color', 'white')
$('.modal-content h2').css('color', 'white')
$('.modal-content span').css('color', 'white')
$('.modal-content').css('background-color', 'black')
$('.close').css('color', 'white')
$('#myBtn1').css('color', 'white')
$('#myBtn2').css('color', 'white')
$('#scanid').css('color', 'white')
$('.c3-axis-y').css('fill', 'white')
$('.c3-axis-x').css('fill', 'white')
$('.c3-legend-item text').css('fill', 'white')
$('.domain').css('stroke', 'white')
$('.tick line').css('stroke', 'white')
$('#mapid span').css('color', 'black')
$('.sidenav').css('background-color', '#414141')
$('.settings').css('background-color', '#414141')
$('#tabulatorsheet').attr('href', '{{ url_for("static", filename="css/tabulator_midnight.min.css") }}');
}
}
$( document ).ready(function() {
namespace = '/update_status';
@ -140,45 +197,32 @@
// There is Scan data ready for us!
// Grab the latest set of data.
$.getJSON("/get_scan_data", function(data){
// Load the data into our data stores.
scan_chart_spectra.columns[0] = ['x_spectra'].concat(data.freq);
scan_chart_spectra.columns[1] = ['Spectra'].concat(data.power);
scan_chart_peaks.columns[0] = ['x_peaks'].concat(data.peak_freq);
scan_chart_peaks.columns[1] = ['Peaks'].concat(data.peak_lvl);
scan_chart_threshold.columns[0] = ['x_thresh'].concat([data.freq[0],data.freq[data.freq.length-1]]);
scan_chart_threshold.columns[1] = ['Threshold'].concat([data.threshold+autorx_config.snr_threshold,data.threshold+autorx_config.snr_threshold]);
// Plot the updated data.
scan_chart_obj.load(scan_chart_spectra);
scan_chart_obj.load(scan_chart_peaks);
scan_chart_obj.load(scan_chart_threshold);
scan_chart_latest_timestamp = data.timestamp;
// Run dark mode check again to solve render issues.
var z = getCookie('dark');
if (z == 'true') {
changeTheme(true);
} else if (z == 'false') {
changeTheme(false);
} else if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
changeTheme(true);
} else {
changeTheme(false);
}
// Show the latest scan time.
if (getCookie('UTC') == 'false') {
temp_date = data.timestamp;
temp_date = temp_date.slice(0, -3);
temp_date += "Z";
var date = new Date(temp_date);
var date_converted = date.toLocaleString(window.navigator.language,{hourCycle:'h23', year:"numeric", month:"2-digit", day:'2-digit', hour:'2-digit',minute:'2-digit', second:'2-digit'});
$('#scan_results').html('<b>Latest Scan:</b> ' + date_converted);
// Do not update the scan plot if the tab is hidden, or we have the scan plot hidden.
if( (document.visibilityState == "hidden") || (document.getElementById("showscanbutton").checked == false) ){
return;
} else {
$('#scan_results').html('<b>Latest Scan:</b> ' + (data.timestamp.slice(0, -3) + 'Z').replace("T", " ").replace("Z", "").slice(0, -4) + ' UTC');
redraw_scan_chart(data);
}
}
);
});
document.addEventListener("visibilitychange", () => {
if (document.visibilityState === "visible" && document.getElementById("showscanbutton").checked) {
redraw_scan_chart();
}
});
socket.on('task_event', function(msg){
update_task_list();
});
@ -332,62 +376,6 @@
changeTheme(false);
}
// Function to change CSS options when changing dark mode.
function changeTheme(dark) {
if (dark == false) {
document.body.style.background = 'white';
if (document.getElementById("log-tray").style.color == "rgb(255, 0, 0)") {
$('#main span').css('color', 'black')
$('#log-tray').css('color', 'red');
} else {
$('#main span').css('color', 'black')
}
$('#main p').css('color', 'black')
$('.modal-content p').css('color', 'black')
$('.modal-content h2').css('color', 'black')
$('.modal-content span').css('color', 'black')
$('.modal-content').css('background-color', 'white')
$('.close').css('color', 'black')
$('#myBtn1').css('color', 'black')
$('#myBtn2').css('color', 'black')
$('#scanid').css('color', 'black')
$('.c3-axis-y').css('fill', 'black')
$('.c3-axis-x').css('fill', 'black')
$('.c3-legend-item text').css('fill', 'black')
$('.domain').css('stroke', 'black')
$('.tick line').css('stroke', 'black')
$('#mapid span').css('color', 'black')
$('.sidenav').css('background-color', '#111')
$('.settings').css('background-color', '#111')
$('#tabulatorsheet').attr('href', '{{ url_for("static", filename="css/tabulator_simple.min.css") }}');
} else {
document.body.style.background = '#121212';
if (document.getElementById("log-tray").style.color == "rgb(255, 0, 0)") {
$('#main span').css('color', 'white')
$('#log-tray').css('color', 'red');
} else {
$('#main span').css('color', 'white')
}
$('#main p').css('color', 'white')
$('.modal-content p').css('color', 'white')
$('.modal-content h2').css('color', 'white')
$('.modal-content span').css('color', 'white')
$('.modal-content').css('background-color', 'black')
$('.close').css('color', 'white')
$('#myBtn1').css('color', 'white')
$('#myBtn2').css('color', 'white')
$('#scanid').css('color', 'white')
$('.c3-axis-y').css('fill', 'white')
$('.c3-axis-x').css('fill', 'white')
$('.c3-legend-item text').css('fill', 'white')
$('.domain').css('stroke', 'white')
$('.tick line').css('stroke', 'white')
$('#mapid span').css('color', 'black')
$('.sidenav').css('background-color', '#414141')
$('.settings').css('background-color', '#414141')
$('#tabulatorsheet').attr('href', '{{ url_for("static", filename="css/tabulator_midnight.min.css") }}');
}
}
// Check if dark mode button has been ticked.
$('#showdarkbutton').change(function() {
@ -1343,6 +1331,7 @@
document.getElementById("scanid").style.display = "block";
setCookie("scan", 'true', 365);
mymap.invalidateSize();
redraw_scan_chart();
setTimeout(scan_chart_obj.resize,500);
}
}
@ -1627,7 +1616,7 @@
<div id="telem_table"></div>
</div>
<div id="scanid">
<h2>Scan Results:</h2>
<h2>Scan Results</h2>
<div id='scan_results'>No scan data yet...</div>
<div id="scan_chart" style="width:100%;"></div>
</div>