diff --git a/secop/gui/modulectrl.py b/secop/gui/modulectrl.py index 4c54d86..0fe5210 100644 --- a/secop/gui/modulectrl.py +++ b/secop/gui/modulectrl.py @@ -165,7 +165,8 @@ class ModuleCtrl(QWidget): result = None qualifiers = {} # XXX: flag missing data report as error - showCommandResultDialog(command, args, result, qualifiers) + if result is not None: + showCommandResultDialog(command, args, result, qualifiers) def _initModuleWidgets(self): initValues = self._node.queryCache(self._module) diff --git a/secop/gui/params/__init__.py b/secop/gui/params/__init__.py index 92e5584..60da285 100644 --- a/secop/gui/params/__init__.py +++ b/secop/gui/params/__init__.py @@ -76,7 +76,13 @@ class GenericParameterWidget(ParameterWidget): self.setLineEdit.text()) def updateValue(self, value): - self.currentLineEdit.setText(str(value)) + fmtstr = getattr(self._datatype, 'fmtstr', '%s') + if value.readerror: + value = str(value) + else: + value = fmtstr % (value.value,) + self.currentLineEdit.setText(value) + # self.currentLineEdit.setText(str(value)) class EnumParameterWidget(GenericParameterWidget): diff --git a/secop_psi/ls370sim.py b/secop_psi/ls370sim.py index e0dbf08..354f4f1 100644 --- a/secop_psi/ls370sim.py +++ b/secop_psi/ls370sim.py @@ -28,12 +28,12 @@ class Ls370Sim(Communicator): ('RDGR?%d', '1.0'), ('RDGST?%d', '0'), ('RDGRNG?%d', '0,5,5,0,0'), - ('INSET?%d', '1,5,5,0,0'), - ('FILTER?%d', '1,5,80'), + ('INSET?%d', '1,3,3,0,0'), + ('FILTER?%d', '1,1,80'), ] OTHER_COMMANDS = [ ('*IDN?', 'LSCI,MODEL370,370184,05302003'), - ('SCAN?', '3,1'), + ('SCAN?', '3,0'), ] def earlyInit(self):