2 Commits

Author SHA1 Message Date
daa4c72133 fixes on secop gui
- do not display a dialog when a command returns None
- apply fmtstr, if available

Change-Id: I74da3e86e4eae9000608581e0a0f6e8c72cef715
2021-06-04 12:27:46 +02:00
96f4133a4b changes defaults in ls370sim
Change-Id: I6388358c42a4b115fc5aec4df0d4588457140744
2021-06-04 12:27:30 +02:00
3 changed files with 12 additions and 5 deletions

View File

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

View File

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

View File

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