GUI: Control Panel changes #2

Open
atse wants to merge 21 commits from gui_dev-ctrl_panel into gui_dev
2 changed files with 29 additions and 19 deletions
Showing only changes of commit eddfc40e07 - Show all commits

View File

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

View File

@ -1,23 +1,31 @@
{
"ctrl_panel": [
{
"name": "temperature",
"title": "Temperature",
"type": "float",
"format": "{value:.4f} {suffix}",
"suffix": "°C",
"readonly": true,
"tip": "The measured temperature at the thermistor"
},
{
"name": "tec_i",
"title": "Current through TEC",
"type": "float",
"siPrefix": true,
"suffix": "A",
"decimals": 6,
"readonly": true,
"tip": "The measured current through the TEC"
"name": "readings",
"title": "Readings",
"type": "group",
"tip": "Thermostat readings",
"children": [
{
"name": "temperature",
"title": "Temperature",
"type": "float",
"format": "{value:.4f} {suffix}",
"suffix": "°C",
"readonly": true,
"tip": "The measured temperature at the thermistor"
},
{
"name": "tec_i",
"title": "Current through TEC",
"type": "float",
"siPrefix": true,
"suffix": "A",
"decimals": 6,
"readonly": true,
"tip": "The measured current through the TEC"
}
]
},
{
"name": "output",