From e0090a59183b7f6c584fe28ee49eb8e95685f6f8 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 21 Feb 2023 17:00:51 +0100 Subject: [PATCH] gui: as a stopgap measure, apply %g format to floats 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 Reviewed-by: Georg Brandl --- frappy/gui/moduleoverview.py | 8 +++++++- frappy/gui/modulewidget.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frappy/gui/moduleoverview.py b/frappy/gui/moduleoverview.py index f26ea54..92a065e 100644 --- a/frappy/gui/moduleoverview.py +++ b/frappy/gui/moduleoverview.py @@ -75,7 +75,13 @@ class ModuleItem(QTreeWidgetItem): self.setIcon(self.display[parameter], ModuleItem.statusIcon(value.value[0].value)) self.setText(self.display['status/text'], value.value[1]) 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): self.setIcon(self.display['status'], ModuleItem.icons['unknown']) diff --git a/frappy/gui/modulewidget.py b/frappy/gui/modulewidget.py index 2660d84..099e8d7 100644 --- a/frappy/gui/modulewidget.py +++ b/frappy/gui/modulewidget.py @@ -132,7 +132,13 @@ class ModuleWidget(QWidget): if mod != self._name: return 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): props = self._node.getProperties(self._name, param)