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 11:15:27 -07:00
parent 368401176b 7f82627135
commit 9c69967be1
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
View File

@@ -141,7 +141,8 @@ class RoverMapCoordinator(QtCore.QThread):
navigation_list = self._get_table_elements(self.navigation_label) navigation_list = self._get_table_elements(self.navigation_label)
# landmark_list = self._get_table_elements(self.landmark_label) # landmark_list = self._get_table_elements(self.landmark_label)
landmark_list = [] landmark_list = []
self.overlay_image = self.overlay_image_object.update_new_location(latitude, self.overlay_image = self.overlay_image_object.update_new_location(
latitude,
longitude, longitude,
70, 70,
navigation_list, navigation_list,

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

@@ -27,6 +27,18 @@ class WaypointsCoordinator(QtCore.QThread):
self.longitude_label = (self.left_screen. self.longitude_label = (self.left_screen.
manual_waypoint_decimal_longitude_spin_box) manual_waypoint_decimal_longitude_spin_box)
self.latitude_degree_label = self.left_screen.manual_waypoint_degrees_lattitude_spin_box
self.longitude_degree_label = self.left_screen.manual_waypoint_degrees_longitude_spin_box
self.latitude_minute_label = self.left_screen.manual_waypoint_minutes_lattitude_spin_box
self.longitude_minute_label = self.left_screen.manual_waypoint_minutes_longitude_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
# 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)
@@ -209,6 +221,9 @@ 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)))
self.latitude_second_label.setValue(lat-int(lat)-int(lat-(int(lat) * 60))/60 * 3600)
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