Skip to content

Commit

Permalink
Merge pull request #961 from ke5gdb/testing
Browse files Browse the repository at this point in the history 
Move to collapsable web GUI elements
  • Loading branch information
@darksidelemm
darksidelemm authored Dec 21, 2024
2 parents eba2a08 + 1466682 commit 7f013a8
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 91 deletions.
2 changes: 1 addition & 1 deletion auto_rx/autorx/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# 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.8.0"
__version__ = "1.8.1-beta1"

# Global Variables

Expand Down
139 changes: 49 additions & 90 deletions auto_rx/autorx/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
scan_chart_latest_timestamp = data.timestamp;

// 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) ){
if( (document.visibilityState == "hidden") || (document.getElementById("scanid").hasAttribute("open") == false) ){
return;
} else {
redraw_scan_chart(data);
Expand All @@ -224,7 +224,7 @@
});

document.addEventListener("visibilitychange", () => {
if (document.visibilityState === "visible" && document.getElementById("showscanbutton").checked) {
if (document.visibilityState === "visible" && document.getElementById("scanid").hasAttribute("open")) {
redraw_scan_chart();
}
});
Expand Down Expand Up @@ -311,19 +311,18 @@
});

// Check if user has preffered map visiblity.
if (getCookie('map') == 'false') {
document.getElementById("showmapbutton").checked = false;
document.getElementById("mapid").style.display = "none";
if (getCookie('map') == 'true') {
document.getElementById("mapid_details").setAttribute("open", true) ;
} else {
document.getElementById("showmapbutton").checked = true;
document.getElementById("mapid_details").removeAttribute("open") ;
document.getElementById("mapid").style.display = "none";
}

// Check if user has preffered table visiblity.
if (getCookie('table') == 'false') {
document.getElementById("showtablebutton").checked = false;
document.getElementById("tableid").style.display = "none";
if (getCookie('table') == 'true') {
document.getElementById("tableid").setAttribute("open", true) ;
} else {
document.getElementById("showtablebutton").checked = true;
document.getElementById("tableid").removeAttribute("open") ;
}

// Check if user has preffered follow latest sonde selection.
Expand Down Expand Up @@ -360,11 +359,9 @@

// Check if user has preffered scan chart visiblity.
if (getCookie('scan') == 'true') {
document.getElementById("showscanbutton").checked = true;
document.getElementById("scanid").style.display = "block";
document.getElementById("scanid").setAttribute("open", true) ;
} else {
document.getElementById("showscanbutton").checked = false;
document.getElementById("scanid").style.display = "none";
document.getElementById("scanid").removeAttribute("open") ;
}

// Check if user has dark mode set.
Expand Down Expand Up @@ -464,6 +461,31 @@
mymap.invalidateSize();
})

$("#tableid").on("toggle", function() {
mymap.invalidateSize();
setCookie("table", $("#tableid").prop("open"), 365);
})

$("#scanid").on("toggle", function() {
mymap.invalidateSize();
setCookie("scan", $("#scanid").prop("open"), 365);
if ($("#scanid").prop("open")) {
redraw_scan_chart();
scan_chart_obj.flush();
}
})

$("#mapid_details").on("toggle", function() {
mymap.invalidateSize();
setCookie("map", $("#mapid_details").prop("open"), 365);
if ($("#mapid_details").prop("open")) {
document.getElementById("mapid").style.display = "block";
mymap.invalidateSize();
} else {
document.getElementById("mapid").style.display = "none";
}
})

// Create Tabulator table.
table = new Tabulator("#telem_table", {
index:"realid",
Expand Down Expand Up @@ -1265,7 +1287,7 @@
myDiv.scrollTop = 0;
if ((window.innerWidth/window.innerHeight) > 1) { // 350px wide on desktop.
x.style.display = "none";
if (getCookie('map') == true || document.getElementById("showmapbutton").checked == true) {
if (getCookie('map') == true || document.getElementById("mapid_details").hasAttribute("open")) {
y.style.display = "block";
}
document.getElementById("mySidenav").style.width = "350px";
Expand All @@ -1282,7 +1304,7 @@
}
} else {
x.style.display = "none";
if (getCookie('map') == true || document.getElementById("showmapbutton").checked == true) {
if (getCookie('map') == true || document.getElementById("mapid_details").hasAttribute("open")) {
y.style.display = "block";
}
document.getElementById("mySidenav").style.width = 0;
Expand All @@ -1297,7 +1319,7 @@
var y = document.getElementById('mapid');
if (document.getElementById("mySettings").style.width == "0px" || document.getElementById("mySettings").style.width == 0) {
if ((window.innerWidth/window.innerHeight) > 1) { // 350px wide on desktop.
if (getCookie('map') == true || document.getElementById("showmapbutton").checked == true) {
if (getCookie('map') == true || document.getElementById("mapid_details").hasAttribute("open")) {
y.style.display = "block";
}
document.getElementById("mySettings").style.width = "350px";
Expand All @@ -1313,7 +1335,7 @@
document.getElementById("mySettings").style.borderRadius = "0px";
}
} else {
if (getCookie('map') == true || document.getElementById("showmapbutton").checked == true) {
if (getCookie('map') == true || document.getElementById("mapid_details").hasAttribute("open")) {
y.style.display = "block";
}
document.getElementById("mySettings").style.width = 0;
Expand All @@ -1332,33 +1354,6 @@
}
}

// Show/hide map on button press and update cookies.
function showMap(element) {
if (element.checked == false) {
document.getElementById("mapid").style.display = "none";
setCookie("map", 'false', 365);
} else {
document.getElementById("mapid").style.display = "block";
setCookie("map", 'true', 365);
mymap.invalidateSize();
}
}

// Show/hide scan chart on button press and update cookies.
function showScan(element) {
if (element.checked == false) {
document.getElementById("scanid").style.display = "none";
setCookie("scan", 'false', 365);
mymap.invalidateSize();
} else {
document.getElementById("scanid").style.display = "block";
setCookie("scan", 'true', 365);
mymap.invalidateSize();
redraw_scan_chart();
scan_chart_obj.flush();
}
}

// Enable/disable auto follow on button press and update cookies.
function autoFollow(element) {
if (element.checked == false) {
Expand All @@ -1368,17 +1363,6 @@
}
}

// Show/hide table on button press and update cookies.
function showTable(element) {
if (element.checked == false) {
document.getElementById("tableid").style.display = "none";
setCookie("table", 'false', 365);
} else {
document.getElementById("tableid").style.display = "block";
setCookie("table", 'true', 365);
}
}

// Set given cookie name and value.
function setCookie(name,value) {
localStorage.setItem(name, value);
Expand Down Expand Up @@ -1493,36 +1477,6 @@ <h2 style="display:inline; vertical-align:middle; margin-left: 35px; margin-bott
<label> Other</label><br><br>
</form>
<div style="margin-left:40px;">
<h2 style="display:inline;vertical-align:middle;">Show Table</h2>
&nbsp;
<div style="display:inline;vertical-align:middle;">
<label class="switch">
<input type="checkbox" onchange="showTable(this)" id="showtablebutton">
<span class="slider round"></span>
</label>
</div>
<br>
<br>
<h2 style="display:inline;vertical-align:middle;">Show Scan Plot</h2>
&nbsp;
<div style="display:inline;vertical-align:middle;">
<label class="switch">
<input type="checkbox" onchange="showScan(this)" id="showscanbutton">
<span class="slider round"></span>
</label>
</div>
<br>
<br>
<h2 style="display:inline;vertical-align:middle;">Show Map</h2>
&nbsp;
<div style="display:inline;vertical-align:middle;">
<label class="switch">
<input type="checkbox" onchange="showMap(this)" id="showmapbutton">
<span class="slider round"></span>
</label>
</div>
<br>
<br>
<h2 style="display:inline;vertical-align:middle;">Dark Mode</h2>
&nbsp;
<div style="display:inline;vertical-align:middle;">
Expand Down Expand Up @@ -1638,14 +1592,19 @@ <h2 style="display:inline;vertical-align:middle;">Historical View</h2>
<summary id="summary_element">Tasking: <span id="task_summary"></span></summary>
<span id="task_details"></span>
</details>
<div id="tableid">
<details id="tableid" style="font-size:2vh;font-size:calc(var(--vh, 1vh) * 2);">
<summary id="summary_element_telem_table">Telemetry</summary>
<div id="telem_table"></div>
</div>
<div id="scanid">
</details>
<details id="scanid" style="font-size:2vh;font-size:calc(var(--vh, 1vh) * 2);">
<summary id="summary_element_scan_plot">Scan Plot</summary>
<div id='scan_results'>No scan data yet...</div>
<div id="scan_chart" style="width:100%;"></div>
</div>
</details>
<br>
<details id="mapid_details" style="font-size:2vh;font-size:calc(var(--vh, 1vh) * 2);">
<summary id="summary_element_map">Map</summary>
</details>
<div id="mapid"></div>
<i id="myBtn1" onclick="changeSettings()" class="icon-cog" style="font-size:4vh;font-size:calc(var(--vh, 1vh) * 4);"></i>
<a href="historical.html" id="myBtn2"><i class="icon-history" style="font-size:4vh;font-size:calc(var(--vh, 1vh) * 4);"></i></a>
Expand Down

0 comments on commit 7f013a8

Please sign in to comment.