caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 18:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set DMS cardinality

Browse Source
This commit is contained in:
Chris Pham
2018-04-12 12:21:13 -07:00
parent af7b48f19a
commit e8ddedcf42
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
View File

@@ -39,6 +39,10 @@ class WaypointsCoordinator(QtCore.QThread):
self.longitude_second_label = self.left_screen.manual_waypoint_seconds_longitude_spin_box self.longitude_second_label = self.left_screen.manual_waypoint_seconds_longitude_spin_box
self.latitude_card_label = self.left_screen.manual_waypoint_cardinal_lattitude_combo_box
self.longitude_card_label = self.left_screen.manual_waypoint_cardinal_longitude_combo_box
# Nav Table Buttons # Nav Table Buttons
self.nav_set_button_label = (self.left_screen. self.nav_set_button_label = (self.left_screen.
navigation_waypoints_set_button) navigation_waypoints_set_button)
@@ -225,6 +229,10 @@ class WaypointsCoordinator(QtCore.QThread):
lat_d = float(int(lat)) lat_d = float(int(lat))
lat_m = float(int((lat - lat_d) * 60)) lat_m = float(int((lat - lat_d) * 60))
lat_s = ((lat - lat_d - (lat_m/60.0)) * 3600.) lat_s = ((lat - lat_d - (lat_m/60.0)) * 3600.)
if lat_d > 0:
self.latitude_card_label.setCurrentText("N")
else:
self.latitude_card_label.setCurrentText("S")
self.latitude_degree_label.setValue(lat_d) self.latitude_degree_label.setValue(lat_d)
self.latitude_minute_label.setValue(lat_m) self.latitude_minute_label.setValue(lat_m)
self.latitude_second_label.setValue(lat_s) self.latitude_second_label.setValue(lat_s)
@@ -232,6 +240,10 @@ class WaypointsCoordinator(QtCore.QThread):
lng_d = float(int(lng)) lng_d = float(int(lng))
lng_m = float(int((lng - lng_d) * 60)) lng_m = float(int((lng - lng_d) * 60))
lng_s = ((lng - lng_d - (lng_m/60.0)) * 3600.) lng_s = ((lng - lng_d - (lng_m/60.0)) * 3600.)
if lng_d > 0:
self.longitude_card_label.setCurrentText("W")
else:
self.longitude_card_label.setCurrentText("E")
self.longitude_degree_label.setValue(lng_d) self.longitude_degree_label.setValue(lng_d)
self.longitude_minute_label.setValue(lng_m) self.longitude_minute_label.setValue(lng_m)
self.longitude_second_label.setValue(lng_s) self.longitude_second_label.setValue(lng_s)