From 443cc5dd837567b0335bea229a4b5a567d3e83e7 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 12 Apr 2018 11:22:17 -0700 Subject: [PATCH 1/5] 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 From d4dd59937809087ae7c64bc3362b069188989fcd Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 12 Apr 2018 11:24:01 -0700 Subject: [PATCH 2/5] cast lat_min to float --- .../src/Framework/NavigationSystems/WaypointsCoordinator.py | 4 ++-- 1 file changed, 2 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 91bf94b..05bea1d 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py @@ -222,9 +222,9 @@ class WaypointsCoordinator(QtCore.QThread): self.latitude_label.setValue(lat) self.longitude_label.setValue(lng) self.latitude_degree_label.setValue(int(lat)) - lat_minute = (lat - float(int(lat))) * 60 + lat_minute = (lat - float(int(lat))) * 60. self.latitude_minute_label.setValue(lat_minute) - lat_seconds = (lat - float(int(lat)) - lat_minute/60.) * 3600 + lat_seconds = (lat - float(int(lat)) - lat_minute/60.) * 3600. self.latitude_second_label.setValue(lat_seconds) def _on_nav_clicked(self, row, col): From 30f518c34ffc146cc0082baeec1843f22c15095b Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 12 Apr 2018 11:26:42 -0700 Subject: [PATCH 3/5] DMS for longitude added --- .../Framework/NavigationSystems/WaypointsCoordinator.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 05bea1d..40e2dda 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py @@ -224,9 +224,15 @@ class WaypointsCoordinator(QtCore.QThread): self.latitude_degree_label.setValue(int(lat)) lat_minute = (lat - float(int(lat))) * 60. self.latitude_minute_label.setValue(lat_minute) - lat_seconds = (lat - float(int(lat)) - lat_minute/60.) * 3600. + lat_seconds = (lat - float(int(lat)) - lat_minute/60.) * 3600. self.latitude_second_label.setValue(lat_seconds) + self.longitude_degree_label.setValue(int(lng)) + lng_minute = (lng - float(int(lng))) * 60. + self.longitude_minute_label.setValue(lng_minute) + lng_seconds = (lng - float(int(lng)) - lng_minute/60.) * 3600. + self.longitude_second_label.setValue(lng_seconds) + def _on_nav_clicked(self, row, col): self.navigation_table_cur_click = row self.landmark_table_cur_click = None From 1507c11f47d642aae6fc2490f2e9bb3098a19501 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 12 Apr 2018 11:28:58 -0700 Subject: [PATCH 4/5] Correct mispelling on longitude_second_label --- .../src/Framework/NavigationSystems/WaypointsCoordinator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 40e2dda..1ceabde 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py @@ -37,7 +37,7 @@ class WaypointsCoordinator(QtCore.QThread): self.latitude_second_label = self.left_screen.manual_waypoint_seconds_lattitude_spin_box - self.longitude_seccond_label = self.left_screen.manual_waypoint_seconds_longitude_spin_box + self.longitude_second_label = self.left_screen.manual_waypoint_seconds_longitude_spin_box # Nav Table Buttons self.nav_set_button_label = (self.left_screen. From af7b48f19a5b8e6ea94ddbe9cf944453d160f7af Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 12 Apr 2018 12:08:06 -0700 Subject: [PATCH 5/5] Fixed DMS issues, needed to fix int cast --- .../NavigationSystems/WaypointsCoordinator.py | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 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 1ceabde..c5596ad 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py @@ -221,17 +221,20 @@ class WaypointsCoordinator(QtCore.QThread): self.name_edit_label.setText(name) self.latitude_label.setValue(lat) self.longitude_label.setValue(lng) - self.latitude_degree_label.setValue(int(lat)) - 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) - self.longitude_degree_label.setValue(int(lng)) - lng_minute = (lng - float(int(lng))) * 60. - self.longitude_minute_label.setValue(lng_minute) - lng_seconds = (lng - float(int(lng)) - lng_minute/60.) * 3600. - self.longitude_second_label.setValue(lng_seconds) + lat_d = float(int(lat)) + lat_m = float(int((lat - lat_d) * 60)) + lat_s = ((lat - lat_d - (lat_m/60.0)) * 3600.) + self.latitude_degree_label.setValue(lat_d) + self.latitude_minute_label.setValue(lat_m) + self.latitude_second_label.setValue(lat_s) + + lng_d = float(int(lng)) + lng_m = float(int((lng - lng_d) * 60)) + lng_s = ((lng - lng_d - (lng_m/60.0)) * 3600.) + self.longitude_degree_label.setValue(lng_d) + self.longitude_minute_label.setValue(lng_m) + self.longitude_second_label.setValue(lng_s) def _on_nav_clicked(self, row, col): self.navigation_table_cur_click = row