From 98d40c34e0ad4dc7cdfcb9bc3542a3cb714d99f1 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Sat, 17 Mar 2018 15:35:29 -0700 Subject: [PATCH] Change disable type --- .../NavigationSystems/WaypointsCoordinator.py | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 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 a08a674..d1f22c3 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py @@ -25,6 +25,16 @@ class WaypointsCoordinator(QtCore.QThread): self.longitude_label = (self.left_screen. manual_waypoint_decimal_longitude_spin_box) + # Nav Table Buttons + self.nav_set_label = (self.left_screen. + navigation_waypoints_set_buton) + self.nav_add_manual_label = (self.left_screen. + navigation_waypoints_add_manual_button) + self.nav_add_gps_label = (self.left_screen. + navigation_waypoints_add_gps_button) + self.nav_delete_label = (self.left_screen. + navigation_waypoints_delete_button) + self.settings = QtCore.QSettings() self.logger = logging.getLogger("groundstation") @@ -37,23 +47,37 @@ class WaypointsCoordinator(QtCore.QThread): self.new_manual_waypoint_entry.connect(self.update_manual_entry) # setting up signals to save for Navigation Table - # self. + self.nav_add_gps_label.onClick(self._nav_add_gps) self.navigation_label.cellClicked.connect(self._on_nav_clicked) self.landmark_label.cellClicked.connect(self._on_land_clicked) - def setup_signals(self, start_signal, + def _add_to_table(self, name, lat, lng, dist, table): + count = table.rowCount() + table.addRow(count) + table.setItem(count, 0, QtGui.QTableWidgetItem(name)) + table.setItem(count, 1, QtGui.QTableWidgetItem(lat)) + table.setItem(count, 2, QtGui.QTableWidgetItem(lng)) + table.setItem(count, 3, QtGui.QTableWidgetItem(dist)) + + def _nav_add_gps(self): + # request GPS data + name = self.navigation_label.rowCount() + + self._add_to_table(name, lat, lng,) + + def setup_signals(self, start_signal, signals_and_slots_signal, kill_signal): start_signal.connect(self.start) signals_and_slots_signal.connect(self.connect_signals_and_slots) kill_signal.connect(self.on_kill_threads_requested_slot) - + def on_kill_threads_requested_slot(self): self.run_thread_flag = False def update_manual_entry(self, name, lat, lng, table): print name, lat, lng, table - self.name_edit_label.setReadOnly(table+1 % 2) + self.name_edit_label.setDisable(table+1 % 2) self.name_edit_label.setText(name) self.latitude_label.setValue(lat) self.longitude_label.setValue(lng) @@ -74,4 +98,4 @@ class WaypointsCoordinator(QtCore.QThread): float(self.landmark_label.item(row, 1).text()), float(self.landmark_label.item(row, 2).text()), 1 - ) \ No newline at end of file + )