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

Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018

Browse Source
This commit is contained in:
Corwin Perren
2018-04-12 12:08:30 -07:00
parent cf95a46c7d af7b48f19a
commit 58295c6adb
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ class WaypointsCoordinator(QtCore.QThread):
self.latitude_second_label = self.left_screen.manual_waypoint_seconds_lattitude_spin_box 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 # Nav Table Buttons
self.nav_set_button_label = (self.left_screen. self.nav_set_button_label = (self.left_screen.
@@ -221,9 +221,20 @@ class WaypointsCoordinator(QtCore.QThread):
self.name_edit_label.setText(name) self.name_edit_label.setText(name)
self.latitude_label.setValue(lat) self.latitude_label.setValue(lat)
self.longitude_label.setValue(lng) self.longitude_label.setValue(lng)
self.latitude_degree_label.setValue(int(lat))
self.latitude_minute_label.setValue(int(lat-(int(lat) * 60))) lat_d = float(int(lat))
self.latitude_second_label.setValue(lat-int(lat)-int(lat-(int(lat) * 60))/60 * 3600) 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): def _on_nav_clicked(self, row, col):
self.navigation_table_cur_click = row self.navigation_table_cur_click = row