GUI: clean up callback for enum ComboBoxes

Change-Id: I17450fb1701aeb252c6ce5a27db5f336ba138bb0
Reviewed-on: https://forge.frm2.tum.de/review/17748
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Tested-by: Jens Krueger <jens.krueger@frm2.tum.de>
This commit is contained in:
Jens Krüger 2018-04-17 14:20:10 +02:00 committed by Jens Krueger
parent 9f9dd9e3a3
commit 851da9696c

View File

@ -315,7 +315,7 @@ class DrivableWidget(ReadableWidget):
@pyqtSlot() @pyqtSlot()
def on_cmdPushButton_clicked(self): def on_cmdPushButton_clicked(self):
if self._is_enum: if self._is_enum:
self.on_targetComboBox_activated() self.on_targetComboBox_activated(self.targetComboBox.currentText())
else: else:
self.on_targetLineEdit_returnPressed() self.on_targetLineEdit_returnPressed()
@ -324,7 +324,5 @@ class DrivableWidget(ReadableWidget):
self.target_go(self.targetLineEdit.text()) self.target_go(self.targetLineEdit.text())
@pyqtSlot(unicode) @pyqtSlot(unicode)
def on_targetComboBox_activated(self, stuff=''): def on_targetComboBox_activated(self, stuff):
if isinstance(stuff, (str, unicode)): self.target_go(stuff)
return
self.target_go(self._map[self.targetComboBox.currentIndex()][0])