Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip

secop/gui/modulectrl.py

@@ -165,6 +165,7 @@ class ModuleCtrl(QWidget):
             result = None
             qualifiers = {}
             # XXX: flag missing data report as error
+        if result is not None:
             showCommandResultDialog(command, args, result, qualifiers)
 
     def _initModuleWidgets(self):

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):

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):