linuswck/thermostat
1
0
Fork 0
forked from M-Labs/thermostat
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 +29 -19
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eddfc40e07 - Show all commits

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

@ -142,11 +142,13 @@ class CtrlPanel(QObject):
"output", "control_method", "i_set" "output", "control_method", "i_set"
).setValue(settings["i_set"]) ).setValue(settings["i_set"])
if settings["temperature"] is not None: if settings["temperature"] is not None:
self.params[channel].child("temperature").setValue( self.params[channel].child("readings", "temperature").setValue(
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(settings["tec_i"]) self.params[channel].child("readings", "tec_i").setValue(
settings["tec_i"]
)
@pyqtSlot("QVariantList") @pyqtSlot("QVariantList")
def update_thermistor(self, sh_data): def update_thermistor(self, sh_data):

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

@ -1,5 +1,11 @@
{ {
"ctrl_panel": [ "ctrl_panel": [
{
"name": "readings",
"title": "Readings",
"type": "group",
"tip": "Thermostat readings",
"children": [
{ {
"name": "temperature", "name": "temperature",
"title": "Temperature", "title": "Temperature",
@ -18,6 +24,8 @@
"decimals": 6, "decimals": 6,
"readonly": true, "readonly": true,
"tip": "The measured current through the TEC" "tip": "The measured current through the TEC"
}
]
}, },
{ {
"name": "output", "name": "output",