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

move unit into display label

Browse Source 
TODO: decide if this is preferable to a dedicated label
Change-Id: I707fad5ab85bf2de53f82bc638a9fe20eb26f14e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30786
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
This commit is contained in:
Alexander Zaft
2023-03-24 14:53:15 +01:00
committed by Markus Zolliker
parent 6f95c0d825
commit 47000f7a9f
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
frappy/gui/modulewidget.py
View File

@ -288,7 +288,7 @@ 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)) self._paramDisplays[param].setText(val.formatted())
def _addParam(self, param, row): def _addParam(self, param, row):
paramProps = self._node.getProperties(self._name, param) paramProps = self._node.getProperties(self._name, param)
@ -298,30 +298,23 @@ class ModuleWidget(QWidget):
self._addRWParam(param, row) self._addRWParam(param, row)
def _addRParam(self, param, row): def _addRParam(self, param, row):
props = self._node.getProperties(self._name, param)
nameLabel = AnimatedLabel(param) nameLabel = AnimatedLabel(param)
unitLabel = QLabel(props.get('unit', ''))
display = QLineEdit() display = QLineEdit()
p = display.palette() p = display.palette()
p.setColor(display.backgroundRole(), Colors.palette.window().color()) p.setColor(display.backgroundRole(), Colors.palette.window().color())
display.setPalette(p) display.setPalette(p)
self._paramDisplays[param] = display self._paramDisplays[param] = display
self._paramWidgets[param] = [nameLabel, unitLabel, display] self._paramWidgets[param] = [nameLabel, display]
l = self.moduleDisplay.layout() l = self.moduleDisplay.layout()
l.addWidget(nameLabel, row,0,1,1) l.addWidget(nameLabel, row,0,1,1)
l.addWidget(display, row,1,1,5) l.addWidget(display, row,1,1,5)
l.addWidget(unitLabel, row,6) l.addWidget(QLabel(''), row,6,1,1)
self._addButtons(param, row) self._addButtons(param, row)
def _addRWParam(self, param, row): def _addRWParam(self, param, row):
props = self._node.getProperties(self._name, param)
nameLabel = AnimatedLabel(param) nameLabel = AnimatedLabel(param)
unitLabel = QLabel(props.get('unit', ''))
unitLabel2 = QLabel(props.get('unit', ''))
display = QLineEdit() display = QLineEdit()
inputEdit = QLineEdit() inputEdit = QLineEdit()
submitButton = QPushButton('set') submitButton = QPushButton('set')
@ -335,16 +328,13 @@ class ModuleWidget(QWidget):
inputEdit.returnPressed.connect(lambda: self._button_pressed(param)) inputEdit.returnPressed.connect(lambda: self._button_pressed(param))
self._paramDisplays[param] = display self._paramDisplays[param] = display
self._paramInputs[param] = inputEdit self._paramInputs[param] = inputEdit
self._paramWidgets[param] = [nameLabel, unitLabel, unitLabel2, self._paramWidgets[param] = [nameLabel, display, inputEdit, submitButton]
display, inputEdit, submitButton]
l = self.moduleDisplay.layout() l = self.moduleDisplay.layout()
l.addWidget(nameLabel, row,0,1,1) l.addWidget(nameLabel, row,0,1,1)
l.addWidget(display, row,1,1,2) l.addWidget(display, row,1,1,2)
l.addWidget(unitLabel, row,3,1,1)
l.addWidget(inputEdit, row,4,1,2) l.addWidget(inputEdit, row,4,1,2)
l.addWidget(unitLabel2, row,6,1,1) l.addWidget(submitButton, row, 6)
l.addWidget(submitButton, row, 7)
self._addButtons(param, row) self._addButtons(param, row)
def _addButtons(self, param, row): def _addButtons(self, param, row):
@ -372,9 +362,9 @@ class ModuleWidget(QWidget):
self._paramWidgets[param].append(detailsButton) self._paramWidgets[param].append(detailsButton)
l = self.moduleDisplay.layout() l = self.moduleDisplay.layout()
l.addWidget(plotButton, row, 8) l.addWidget(plotButton, row, 7)
l.addWidget(plotAddButton, row, 9) l.addWidget(plotAddButton, row, 8)
l.addWidget(detailsButton, row, 10) l.addWidget(detailsButton, row, 9)
def _addCommands(self, startrow): def _addCommands(self, startrow):
cmdicons = { cmdicons = {