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

Included a checker to prevent any inputs if the fields are empty

Browse Source
This commit is contained in:
Chris Pham
2018-03-17 20:28:17 -07:00
parent 8ccd4c7d21
commit 70eba06a4b
1 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,15 @@ class WaypointsCoordinator(QtCore.QThread):
self.latitude_label.clear() self.latitude_label.clear()
self.longitude_label.clear() self.longitude_label.clear()
def _is_empty_inputs(self):
if self.name_edit_label.text().isEmpty():
return True
if self.latitude_label.text().isEmpty():
return True
if self.longitude_label.text().isEmpty():
return True
return False
def _nav_add_gps(self): def _nav_add_gps(self):
# request GPS data # request GPS data
name = self.navigation_label.rowCount() name = self.navigation_label.rowCount()
@@ -102,26 +111,30 @@ class WaypointsCoordinator(QtCore.QThread):
self._clear_inputs() self._clear_inputs()
def _nav_save(self): def _nav_save(self):
lat = self.latitude_label.getText() if not self._is_empty_inputs():
lng = self.longitude_label.getText() lat = self.latitude_label.getText()
self.navigation_label.setItem(self.navigation_table_cur_click, lng = self.longitude_label.getText()
1, self.navigation_label.setItem(
QtWidgets.QTableWidgetItem(lat)) self.navigation_table_cur_click,
self.navigation_label.setItem(self.navigation_label, 1,
2, QtWidgets.QTableWidgetItem(lat))
QtWidgets.QTableWidgetItem(lng)) self.navigation_label.setItem(
self._clear_inputs() self.navigation_label,
2,
QtWidgets.QTableWidgetItem(lng))
self._clear_inputs()
def _nav_add_manual(self): def _nav_add_manual(self):
# request GPS data # request GPS data
name = self.navigation_label.rowCount() if not self._is_empty_inputs():
lat = self.latitude_label.getText() name = self.navigation_label.rowCount()
lng = self.longitude_label.getText() lat = self.latitude_label.getText()
distance = 200 lng = self.longitude_label.getText()
self._add_to_table(str(name+1), lat, distance = 200
lng, str(distance), self._add_to_table(str(name+1), lat,
self.navigation_label) lng, str(distance),
self._clear_inputs self.navigation_label)
self._clear_inputs
def _nav_del(self): def _nav_del(self):
if self.navigation_table_cur_click is not None: if self.navigation_table_cur_click is not None:
@@ -145,14 +158,15 @@ class WaypointsCoordinator(QtCore.QThread):
self._clear_inputs() self._clear_inputs()
def _land_add_manual(self): def _land_add_manual(self):
name = self.name_edit_label.getText() if not self._is_empty_inputs():
lat = self.latitude_label.getText() name = self.name_edit_label.getText()
lng = self.longitude_label.getText() lat = self.latitude_label.getText()
distance = 200 lng = self.longitude_label.getText()
self._add_to_table(name, lat, distance = 200
lng, str(distance), self._add_to_table(name, lat,
self.landmark_label) lng, str(distance),
self._clear_inputs() self.landmark_label)
self._clear_inputs()
def _land_del(self): def _land_del(self):
if self.landmark_table_cur_click is not None: if self.landmark_table_cur_click is not None:
@@ -166,20 +180,20 @@ class WaypointsCoordinator(QtCore.QThread):
self._clear_inputs() self._clear_inputs()
def _land_save(self): def _land_save(self):
name = self.name_edit_label.getText() if not self._is_empty_inputs():
lat = self.latitude_label.getText() name = self.name_edit_label.getText()
lng = self.longitude_label.getText() lat = self.latitude_label.getText()
lng = self.longitude_label.getText()
self.landmark_label.setItem(self.landmark_table_cur_click, 0,
QtWidgets.QTableWidgetItem(name))
self.landmark_label.setItem(self.landmark_table_cur_click, 0, self.landmark_label.setItem(self.landmark_table_cur_click, 1,
QtWidgets.QTableWidgetItem(name)) QtWidgets.QTableWidgetItem(lat))
self.landmark_label.setItem(self.landmark_table_cur_click, 1, self.landmark_label.setItem(self.landmark_table_cur_click, 2,
QtWidgets.QTableWidgetItem(lat)) QtWidgets.QTableWidgetItem(lng))
self.landmark_label.setItem(self.landmark_table_cur_click, 2, self._clear_inputs()
QtWidgets.QTableWidgetItem(lng))
self._clear_inputs()
def setup_signals(self, start_signal, def setup_signals(self, start_signal,
signals_and_slots_signal, kill_signal): signals_and_slots_signal, kill_signal):