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

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

Browse Source
This commit is contained in:
zolliker
2021-06-08 11:07:31 +02:00
parent 1619e042e9 8d6ba91a5e
commit eaac83e4d5
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
secop/gui/modulectrl.py
View File

@ -165,7 +165,8 @@ class ModuleCtrl(QWidget):
result = None result = None
qualifiers = {} qualifiers = {}
# XXX: flag missing data report as error # 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): def _initModuleWidgets(self):
initValues = self._node.queryCache(self._module) initValues = self._node.queryCache(self._module)

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

@ -76,7 +76,13 @@ class GenericParameterWidget(ParameterWidget):
self.setLineEdit.text()) self.setLineEdit.text())
def updateValue(self, value): 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): class EnumParameterWidget(GenericParameterWidget):

6
secop_psi/ls370sim.py
View File

@ -28,12 +28,12 @@ class Ls370Sim(Communicator):
('RDGR?%d', '1.0'), ('RDGR?%d', '1.0'),
('RDGST?%d', '0'), ('RDGST?%d', '0'),
('RDGRNG?%d', '0,5,5,0,0'), ('RDGRNG?%d', '0,5,5,0,0'),
('INSET?%d', '1,5,5,0,0'), ('INSET?%d', '1,3,3,0,0'),
('FILTER?%d', '1,5,80'), ('FILTER?%d', '1,1,80'),
] ]
OTHER_COMMANDS = [ OTHER_COMMANDS = [
('*IDN?', 'LSCI,MODEL370,370184,05302003'), ('*IDN?', 'LSCI,MODEL370,370184,05302003'),
('SCAN?', '3,1'), ('SCAN?', '3,0'),
] ]
def earlyInit(self): def earlyInit(self):