Merge pull request #764 from projecthorus/testing

v1.6.1 Release

Author: darksidelemm

auto_rx/autorx/__init__.py

@@ -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.6.0"
+__version__ = "1.6.1"
 
 
 # Global Variables

auto_rx/autorx/log_files.py

@@ -93,6 +93,7 @@ def log_filename_to_stats(filename, quicklook=False):
                     _output["max_range"] = int(max(_output["first"]["range_km"],_output["last"]["range_km"]))
                     _output["last_range"] = int(_output["last"]["range_km"])
                     _output["min_height"] = int(_output["last"]["alt"])
+                    _output["freq"] = _quick["first"]["freq"]
             except Exception as e:
                 logging.error(f"Could not quicklook file {filename}: {str(e)}")
 
@@ -132,6 +133,7 @@ def log_quick_look(filename):
         _first_lat = float(_fields[3])
         _first_lon = float(_fields[4])
         _first_alt = float(_fields[5])
+        _first_freq = float(_fields[13])
         _pos_info = position_info(
             (
                 autorx.config.global_config["station_lat"],
@@ -148,6 +150,7 @@ def log_quick_look(filename):
             "range_km": _pos_info["straight_distance"] / 1000.0,
             "bearing": _pos_info["bearing"],
             "elevation": _pos_info["elevation"],
+            "freq": _first_freq,
         }
     except Exception as e:
         # Couldn't read the first line, so likely no data.
@@ -417,7 +420,7 @@ def calculate_skewt_data(
 
             _temp = temperature[i]
 
-            if humidity[i] >= 0.0:
+            if humidity[i] > 0.0:
                 _rh = humidity[i]
 
                 _dp = (

auto_rx/autorx/static/css/main.css

@@ -76,6 +76,23 @@ a {
   flex-direction: column;
 }
 
+.skewt {
+  height: 100%;
+  width: 0;
+  position: fixed;
+  z-index: 1;
+  top: 0;
+  right: 0;
+  background-color: #111;
+  overflow: hidden;
+  transition: 0.5s;
+  padding-top: 20px;
+  text-align: centre;
+  flex: auto;
+  display: flex;
+  flex-direction: column;
+}
+
 .settings form {
   margin-left: 35px;
   color: white;
@@ -243,20 +260,37 @@ table {
   color: white;
 }
 
-#myBtn {
+.skewt .closebtn3 {
+  position: absolute;
+  top: 6px;
+  left: 16px;
+  font-size: 36px;
+  text-decoration: none;
+  color: black;
+}
+
+#myBtn1 {
   cursor: pointer;
   position: absolute;
   right: 16px;
 }
 
-#historyBtn {
+#myBtn2 {
   cursor: pointer;
   position: absolute;
   right: 6vh;
   right: calc(4vh + 24px);
   color: white;
 }
 
+#myBtn3 {
+  cursor: pointer;
+  position: absolute;
+  right: 6vh;
+  right: calc(8vh + 36px);
+  color: white;
+}
+
 .switch {
   position: relative;
   display: inline-block;

auto_rx/autorx/static/js/scan_chart.js

@@ -4,6 +4,8 @@ var scan_chart_spectra;
 var scan_chart_peaks;
 var scan_chart_threshold;
 var scan_chart_obj;
+var scan_chart_latest_timestamp;
+var scan_chart_last_drawn = "none";
 
 function setup_scan_chart(){
 	scan_chart_spectra = {
@@ -64,4 +66,44 @@ function setup_scan_chart(){
 	    },
 	    point:{r:10}
 	});
+}
+
+function redraw_scan_chart(){
+	// Plot the updated data.
+	if(scan_chart_last_drawn === scan_chart_latest_timestamp){
+		// No need to re-draw.
+		//console.log("No need to re-draw.");
+		return;
+	}
+	scan_chart_obj.load(scan_chart_spectra);
+	scan_chart_obj.load(scan_chart_peaks);
+	scan_chart_obj.load(scan_chart_threshold);
+
+	scan_chart_last_drawn = scan_chart_latest_timestamp;
+
+	//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');
+	}
 }

auto_rx/autorx/static/js/utils.js

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