linuswck
/
thermostat
forked from M-Labs/thermostat
1
0
Fork 0
Code Pull Requests 1 Activity

GUI: Control Panel changes #2

Open
atse wants to merge 21 commits from gui_dev-ctrl_panel into gui_dev
pull from: gui_dev-ctrl_panel
merge into: linuswck:gui_dev
Conversation 13 Commits 21 Files Changed 6 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2df4c03c2d - Show all commits

4
pytec/pytec/gui/view/ctrl_panel.py
View File

@ -160,9 +160,7 @@ class CtrlPanel(QObject):
settings["temperature"] settings["temperature"]
) )
if settings["tec_i"] is not None: if settings["tec_i"] is not None:
self.params[channel].child("tec_i").setValue( self.params[channel].child("tec_i").setValue(settings["tec_i"])
settings["tec_i"] * 1000
)
@pyqtSlot("QVariantList") @pyqtSlot("QVariantList")
def update_thermistor(self, sh_data): def update_thermistor(self, sh_data):

3
pytec/pytec/gui/view/param_tree.json
View File

@ -12,7 +12,8 @@
"name": "tec_i", "name": "tec_i",
"title": "Current through TEC", "title": "Current through TEC",
"type": "float", "type": "float",
"suffix": "mA", "siPrefix": true,
"suffix": "A",
"decimals": 6, "decimals": 6,
"readonly": true, "readonly": true,
"tip": "The measured current through the TEC" "tip": "The measured current through the TEC"