diff --git a/desktop_app/app.py b/desktop_app/app.py index 3b67e6de367f592d6a703adc1b328dfc2c91674e..302d43e4ddd2779f004432b363ba8fa8ddd8a1a4 100644 --- a/desktop_app/app.py +++ b/desktop_app/app.py @@ -150,11 +150,13 @@ class MainWindow(QWidget): async for msg in ws: if msg.type == aiohttp.WSMsgType.TEXT: data = json.loads(msg.data) - coords = data.get('coordinates', []) - telemetry_info = data.get('telemetry', '') + longitude = data.get('longitude') + latitude = data.get('latitude') + telemetry_info = {k: v for k, v in data.items() if k not in ['longitude', 'latitude']} + coords = (latitude, longitude) logger.debug(f"Received coordinates: {coords}") logger.debug(f"Received telemetry: {telemetry_info}") - self.update_map(coords) + self.update_map([coords]) self.update_telemetry(telemetry_info) def load_osm_map(self, osm_file): @@ -175,7 +177,7 @@ class MainWindow(QWidget): def update_map(self, coords): logger.debug("Updating map with new coordinates") - map_osm = folium.Map(location=[45.5236, -122.6750], zoom_start=13) + map_osm = folium.Map(location=[coords[0][0], coords[0][1]], zoom_start=13) for coord in coords: logger.debug(f"Adding marker at: {coord}") folium.Marker(location=coord, popup='Coordinate').add_to(map_osm) @@ -184,7 +186,8 @@ class MainWindow(QWidget): logger.debug("Map updated with new markers") def update_telemetry(self, telemetry_info): - self.telemetry_label.setText(f"Telemetry Data: {telemetry_info}") + telemetry_text = "\n".join([f"{k}: {v}" for k, v in telemetry_info.items()]) + self.telemetry_label.setText(f"Telemetry Data:\n{telemetry_text}") logger.debug("Telemetry data updated") def draw_detections(self, frame, results): @@ -215,13 +218,9 @@ class MainWindow(QWidget): padding: 5px; } QPushButton { - padding: 5px; - margin: 5px; + padding: 5px 10px; } QLabel { - color: #ffffff; - } - QFileDialog { background-color: #2b2b2b; color: #ffffff; } @@ -239,4 +238,4 @@ if __name__ == '__main__': main_window.show() with loop: - loop.run_forever() + loop.run_forever() \ No newline at end of file