linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: Fix doubled slot on 'set' button click

Browse Source 
Change-Id: I65126fc33a25f9c63fa37d896a0fff6ac13150e8
Reviewed-on: https://forge.frm2.tum.de/review/17746
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber 2018-04-16 17:29:19 +02:00 committed by Jens Krueger
parent 82b3e93126
commit 9f9dd9e3a3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secop/gui/modulectrl.py
View File

@ -348,10 +348,6 @@ class ModuleCtrl(QWidget):
return label, buttons return label, buttons
def _set_Button_pressed(self, module, parameter, target): def _set_Button_pressed(self, module, parameter, target):
sig = (module, parameter, target)
if self._lastclick == sig:
return
self._lastclick = sig
try: try:
self._node.setParameter(module, parameter, target) self._node.setParameter(module, parameter, target)
except Exception as e: except Exception as e:

2
secop/gui/nodectrl.py
View File

@ -319,9 +319,11 @@ class DrivableWidget(ReadableWidget):
else: else:
self.on_targetLineEdit_returnPressed() self.on_targetLineEdit_returnPressed()
@pyqtSlot()
def on_targetLineEdit_returnPressed(self): def on_targetLineEdit_returnPressed(self):
self.target_go(self.targetLineEdit.text()) self.target_go(self.targetLineEdit.text())
@pyqtSlot(unicode)
def on_targetComboBox_activated(self, stuff=''): def on_targetComboBox_activated(self, stuff=''):
if isinstance(stuff, (str, unicode)): if isinstance(stuff, (str, unicode)):
return return

5
secop/gui/params/__init__.py
View File

@ -22,7 +22,7 @@
# ***************************************************************************** # *****************************************************************************
from secop.gui.qt import QWidget, QLabel, QPushButton as QButton, QLineEdit, \ from secop.gui.qt import QWidget, QLabel, QPushButton as QButton, QLineEdit, \
QMessageBox, QCheckBox, QSizePolicy, Qt, pyqtSignal QMessageBox, QCheckBox, QSizePolicy, Qt, pyqtSignal, pyqtSlot
from secop.gui.util import loadUi from secop.gui.util import loadUi
from secop.datatypes import * # pylint: disable=wildcard-import from secop.datatypes import * # pylint: disable=wildcard-import
@ -70,6 +70,7 @@ class GenericParameterWidget(ParameterWidget):
self.on_setPushButton_clicked) self.on_setPushButton_clicked)
self.updateValue(str(initvalue)) self.updateValue(str(initvalue))
@pyqtSlot()
def on_setPushButton_clicked(self): def on_setPushButton_clicked(self):
self.setRequested.emit(self._module, self._paramcmd, self.setRequested.emit(self._module, self._paramcmd,
self.setLineEdit.text()) self.setLineEdit.text())
@ -104,6 +105,7 @@ class EnumParameterWidget(GenericParameterWidget):
self.updateValue(str(initvalue)) self.updateValue(str(initvalue))
@pyqtSlot()
def on_setPushButton_clicked(self): def on_setPushButton_clicked(self):
enumval, enumname = self._map[self.setComboBox.currentIndex()] enumval, enumname = self._map[self.setComboBox.currentIndex()]
self.setRequested.emit(self._module, self._paramcmd, enumname) self.setRequested.emit(self._module, self._paramcmd, enumname)
@ -132,6 +134,7 @@ class GenericCmdWidget(ParameterWidget):
self.cmdLineEdit.returnPressed.connect( self.cmdLineEdit.returnPressed.connect(
self.on_cmdPushButton_clicked) self.on_cmdPushButton_clicked)
@pyqtSlot()
def on_cmdPushButton_clicked(self): def on_cmdPushButton_clicked(self):
# wait until command complete before retrying # wait until command complete before retrying
self.cmdPushButton.setEnabled(False) self.cmdPushButton.setEnabled(False)