From 851da9696cc0f7fc3f18bdaeca7cf214e048ddc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Kr=C3=BCger?= Date: Tue, 17 Apr 2018 14:20:10 +0200 Subject: [PATCH] GUI: clean up callback for enum ComboBoxes Change-Id: I17450fb1701aeb252c6ce5a27db5f336ba138bb0 Reviewed-on: https://forge.frm2.tum.de/review/17748 Tested-by: JenkinsCodeReview Reviewed-by: Jens Krueger Tested-by: Jens Krueger --- secop/gui/nodectrl.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/secop/gui/nodectrl.py b/secop/gui/nodectrl.py index 92ab0f9..81a9d65 100644 --- a/secop/gui/nodectrl.py +++ b/secop/gui/nodectrl.py @@ -315,7 +315,7 @@ class DrivableWidget(ReadableWidget): @pyqtSlot() def on_cmdPushButton_clicked(self): if self._is_enum: - self.on_targetComboBox_activated() + self.on_targetComboBox_activated(self.targetComboBox.currentText()) else: self.on_targetLineEdit_returnPressed() @@ -324,7 +324,5 @@ class DrivableWidget(ReadableWidget): self.target_go(self.targetLineEdit.text()) @pyqtSlot(unicode) - def on_targetComboBox_activated(self, stuff=''): - if isinstance(stuff, (str, unicode)): - return - self.target_go(self._map[self.targetComboBox.currentIndex()][0]) + def on_targetComboBox_activated(self, stuff): + self.target_go(stuff)