From 1983f61acddf04f1f689ac3f70fdbb177d4a9e36 Mon Sep 17 00:00:00 2001
From: loowgood <88347485+Lz9000@users.noreply.github.com>
Date: Fri, 24 Mar 2023 19:49:10 +0100
Subject: [PATCH] last update before cs
Signed-off-by: loowgood <88347485+Lz9000@users.noreply.github.com>
---
edvs/modules/managers/graph_manager.py | 11 ++++-------
edvs/modules/managers/serial_manager.py | 4 ++--
edvs/modules/utility/graph_types.py | 1 +
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/edvs/modules/managers/graph_manager.py b/edvs/modules/managers/graph_manager.py
index 31af66b..b0e4793 100644
--- a/edvs/modules/managers/graph_manager.py
+++ b/edvs/modules/managers/graph_manager.py
@@ -60,8 +60,8 @@ def update(self, value):
ping = self.last_update_time.msecsTo(now)
time_mission = ping / 1000
- self.update_labels(self.total_time, ping)
self.update_state(value_chain[3])
+ self.update_labels(self.total_time, ping)
self.graph_temp.update(value_chain[0],time_mission)
self.graph_humidity.update(value_chain[1],time_mission)
@@ -98,7 +98,6 @@ def data_filter(self, value_chain):
return filtered_values
def update_state(self, altitude):
- print(f"{float(altitude)} "+ f" {float(self.previous_altitude)}")
message = f"// #IDLE"
if float(altitude) > float(self.previous_altitude):
@@ -123,8 +122,6 @@ def update_state(self, altitude):
self.parent.ui.lb_state.setText(message)
-
-
# ================================================================= #
def update_labels(self, time, ping):
@@ -134,12 +131,12 @@ def update_labels(self, time, ping):
ping_color = "#d79921"
if ping > 5100:
ping_color = "#a8002a"
-
+
self.parent.ui.lb_countdown.setText(
- f"{time:.2f}S MIT")
+ f"{time:.2f}S MIT")
self.parent.ui.lb_ping.setText(
- f"{ping}ms")
+ f"{ping} ms")
# ================================================================= #
diff --git a/edvs/modules/managers/serial_manager.py b/edvs/modules/managers/serial_manager.py
index ffa17f9..d981b28 100644
--- a/edvs/modules/managers/serial_manager.py
+++ b/edvs/modules/managers/serial_manager.py
@@ -152,8 +152,8 @@ def dummy_serial(self):
pressure = np.random.uniform(800, 1200)
random_value = np.random.randint(0, 6)
- latitude = self.last_latitude + np.random.uniform(0.0001, 0.00001)
- longitude = self.last_longitude + np.random.uniform(0.0001, 0.00001)
+ latitude = self.last_latitude + np.random.uniform(0.00001, 0.000001)
+ longitude = self.last_longitude + np.random.uniform(0.00001, 0.000001)
speed = np.random.uniform(0, 200)
diff --git a/edvs/modules/utility/graph_types.py b/edvs/modules/utility/graph_types.py
index 15c5781..6ab025e 100644
--- a/edvs/modules/utility/graph_types.py
+++ b/edvs/modules/utility/graph_types.py
@@ -69,6 +69,7 @@ def update(self, value, elapsed_time):
self.setXRange(self.ptr1 - elapsed_time, self.ptr1, padding=0.01)
self.graph_plot.setData(x=x_vals, y=smoothed_data)
+
# ================================================================= #
class GpsPlotWidget(pg.PlotItem):
def __init__(self, parent=None, labels={'bottom': 'Longitude', 'left': 'Latitude'}, title=None,