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

gui: as a stopgap measure, apply %g format to floats

Browse Source 
Needs to be properly fixed by sharing the code to format
parameter values everywhere.

Change-Id: I766e4d2cb644153f99f9f40ce0414aa314b47307
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30491
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
This commit is contained in:
Georg Brandl 2023-02-21 17:00:51 +01:00 committed by Markus Zolliker
parent ee9f8536b2
commit e0090a5918
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frappy/gui/moduleoverview.py
View File

@ -75,7 +75,13 @@ class ModuleItem(QTreeWidgetItem):
self.setIcon(self.display[parameter], ModuleItem.statusIcon(value.value[0].value)) self.setIcon(self.display[parameter], ModuleItem.statusIcon(value.value[0].value))
self.setText(self.display['status/text'], value.value[1]) self.setText(self.display['status/text'], value.value[1])
else: else:
self.setText(self.display[parameter], '%s%s' % (str(value), self._unit)) # TODO: stopgap
if value.readerror:
strvalue = str(value)
else:
strvalue = ('%g' if isinstance(value.value, float)
else '%s') % (value.value,)
self.setText(self.display[parameter], '%s %s' % (strvalue, self._unit))
def disconnected(self): def disconnected(self):
self.setIcon(self.display['status'], ModuleItem.icons['unknown']) self.setIcon(self.display['status'], ModuleItem.icons['unknown'])

8
frappy/gui/modulewidget.py
View File

@ -132,7 +132,13 @@ class ModuleWidget(QWidget):
if mod != self._name: if mod != self._name:
return return
if param in self._paramDisplays: if param in self._paramDisplays:
self._paramDisplays[param].setText(str(val.value)) # TODO: stopgap
if val.readerror:
strvalue = str(val)
else:
strvalue = ('%g' if isinstance(val.value, float)
else '%s') % (val.value,)
self._paramDisplays[param].setText(strvalue)
def _addRParam(self, param, row): def _addRParam(self, param, row):
props = self._node.getProperties(self._name, param) props = self._node.getProperties(self._name, param)