From 7f826271356542813ed582df922494ed1595ed87 Mon Sep 17 00:00:00 2001
From: Chris Pham <phamchr@onid.orst.edu>
Date: Thu, 12 Apr 2018 11:10:36 -0700
Subject: [PATCH] Implementing DMS for Latitude

---
 .../Framework/MapSystems/RoverMapCoordinator.py   |  3 ++-
 .../NavigationSystems/WaypointsCoordinator.py     | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
index fdde76d..9ba54dc 100644
--- a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
+++ b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
@@ -141,7 +141,8 @@ class RoverMapCoordinator(QtCore.QThread):
         navigation_list = self._get_table_elements(self.navigation_label)
         # landmark_list = self._get_table_elements(self.landmark_label)
         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,
                                                       70,
                                                       navigation_list,
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 99b93b8..499bb50 100644
--- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
+++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
@@ -26,6 +26,18 @@ class WaypointsCoordinator(QtCore.QThread):
                                manual_waypoint_decimal_lattitude_spin_box)
         self.longitude_label = (self.left_screen.
                                 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
         self.nav_set_button_label = (self.left_screen.
@@ -209,6 +221,9 @@ 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))
+        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):
         self.navigation_table_cur_click = row