From 443cc5dd837567b0335bea229a4b5a567d3e83e7 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 12 Apr 2018 11:22:17 -0700 Subject: [PATCH] DMS convert to var and int/float issues --- .../src/Framework/NavigationSystems/WaypointsCoordinator.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py index 499bb50..91bf94b 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py @@ -222,8 +222,10 @@ class WaypointsCoordinator(QtCore.QThread): self.latitude_label.setValue(lat) self.longitude_label.setValue(lng) self.latitude_degree_label.setValue(int(lat)) - self.latitude_minute_label.setValue(int(lat-(int(lat) * 60))) - self.latitude_second_label.setValue(lat-int(lat)-int(lat-(int(lat) * 60))/60 * 3600) + lat_minute = (lat - float(int(lat))) * 60 + self.latitude_minute_label.setValue(lat_minute) + lat_seconds = (lat - float(int(lat)) - lat_minute/60.) * 3600 + self.latitude_second_label.setValue(lat_seconds) def _on_nav_clicked(self, row, col): self.navigation_table_cur_click = row