ctrl_panel: Keep i_set visible when PID engaged

Since i_set is also plotted, we would also want to see its precise value too.
ctrl_panel: Remove MutexParameter
2024-07-19 14:50:11 +08:00 · 2024-07-19 14:50:11 +08:00 · 2024-07-19 14:50:06 +08:00 · 2024-07-19 11:27:22 +08:00 · 2024-07-19 11:12:54 +08:00 · 2024-07-19 11:12:52 +08:00
3 changed files with 51 additions and 59 deletions
--- a/pytec/pytec/gui/view/ctrl_panel.py
+++ b/pytec/pytec/gui/view/ctrl_panel.py
@ -6,42 +6,6 @@ from pyqtgraph.parametertree import (
 )


-class MutexParameter(pTypes.ListParameter):
-    """
-    Mutually exclusive parameter where only one of its children is visible at a time, list selectable.
-
-    The ordering of the list items determines which children will be visible.
-    """
-
-    def __init__(self, **opts):
-        super().__init__(**opts)
-
-        self.sigValueChanged.connect(self.show_chosen_child)
-        self.sigValueChanged.emit(self, self.opts["value"])
-
-    def _get_param_from_value(self, value):
-        if isinstance(self.opts["limits"], dict):
-            values_list = list(self.opts["limits"].values())
-        else:
-            values_list = self.opts["limits"]
-
-        return self.children()[values_list.index(value)]
-
-    @pyqtSlot(object, object)
-    def show_chosen_child(self, value):
-        for param in self.children():
-            param.hide()
-
-        child_to_show = self._get_param_from_value(value.value())
-        child_to_show.show()
-
-        if child_to_show.opts.get("triggerOnShow", None):
-            child_to_show.sigValueChanged.emit(child_to_show, child_to_show.value())
-
-
-registerParameterType("mutex", MutexParameter)
-
-
 def set_tree_label_tips(tree):
    for item in tree.listAllItems():
        p = item.param
@ -65,31 +29,40 @@ class CtrlPanel(QObject):
        self.trees_ui = trees_ui
        self.NUM_CHANNELS = len(trees_ui)

-        self.THERMOSTAT_PARAMETERS = [param_tree for i in range(self.NUM_CHANNELS)]
-
        self.params = [
            Parameter.create(
                name=f"Thermostat Channel {ch} Parameters",
                type="group",
                value=ch,
-                children=self.THERMOSTAT_PARAMETERS[ch],
+                children=param_tree,
            )
            for ch in range(self.NUM_CHANNELS)
        ]

-        for i, param in enumerate(self.params):
-            param.channel = i
-
-        for i, tree in enumerate(self.trees_ui):
+        for ch, tree in enumerate(self.trees_ui):
            tree.setHeaderHidden(True)
-            tree.setParameters(self.params[i], showTop=False)
-            self.params[i].setValue = self._setValue
-            self.params[i].sigTreeStateChanged.connect(sigTreeStateChanged_handle)
+            tree.setParameters(self.params[ch], showTop=False)

            set_tree_label_tips(tree)

-            for handle in sigActivated_handles[i]:
-                self.params[i].child(*handle[0]).sigActivated.connect(handle[1])
+        for ch, param in enumerate(self.params):
+            self.params[ch].setValue = self._setValue
+            param.sigTreeStateChanged.connect(sigTreeStateChanged_handle)
+
+            for handle in sigActivated_handles[ch]:
+                param.child(*handle[0]).sigActivated.connect(handle[1])
+
+            param.child("output", "control_method").sigValueChanged.connect(
+                lambda param, value: param.child("i_set").setWritable(
+                    value == "constant_current"
+                )
+            )
+
+            param.child("output", "control_method").sigValueChanged.connect(
+                lambda param, value: param.child("target").show(
+                    value == "temperature_pid"
+                )
+            )

    def _setValue(self, value, blockSignal=None):
        """
@ -161,7 +134,7 @@ class CtrlPanel(QObject):
                    )
                    if settings["tec_i"] is not None:
                        self.params[channel].child("tec_i").setValue(
-                            settings["tec_i"] * 1000
+                            settings["tec_i"]
                        )

    @pyqtSlot("QVariantList")
--- a/pytec/pytec/gui/view/param_tree.json
+++ b/pytec/pytec/gui/view/param_tree.json
@ -12,7 +12,8 @@
         "name": "tec_i",
         "title": "Current through TEC",
         "type": "float",
-         "suffix": "mA",
+         "siPrefix": true,
+         "suffix": "A",
         "decimals": 6,
         "readonly": true,
         "tip": "The measured current through the TEC"
@ -27,7 +28,7 @@
            {
               "name": "control_method",
               "title": "Control Method",
-               "type": "mutex",
+               "type": "list",
               "limits": {
                  "Constant Current": "constant_current",
                  "Temperature PID": "temperature_pid"
@ -54,6 +55,7 @@
                     ],
                     "triggerOnShow": true,
                     "decimals": 6,
+                     "compactHeight": false,
                     "param": [
                        "pwm",
                        "ch",
@ -66,6 +68,7 @@
                     "name": "target",
                     "title": "Setpoint (°C)",
                     "type": "float",
+                     "visible": false,
                     "value": 25,
                     "step": 0.1,
                     "limits": [
@ -73,6 +76,7 @@
                        300
                     ],
                     "format": "{value:.4f}",
+                     "compactHeight": false,
                     "param": [
                        "pid",
                        "ch",
@ -97,6 +101,7 @@
                     "value": 0,
                     "step": 100,
                     "decimals": 6,
+                     "compactHeight": false,
                     "limits": [
                        0,
                        2000
@ -116,6 +121,7 @@
                     "value": 0,
                     "step": 100,
                     "decimals": 6,
+                     "compactHeight": false,
                     "limits": [
                        0,
                        2000
@ -136,9 +142,10 @@
                     "step": 0.1,
                     "limits": [
                        0,
-                        5
+                        4
                     ],
                     "siPrefix": true,
+                     "compactHeight": false,
                     "param": [
                        "pwm",
                        "ch",
@ -169,6 +176,7 @@
                  100
               ],
               "format": "{value:.4f}",
+               "compactHeight": false,
               "param": [
                  "s-h",
                  "ch",
@ -184,6 +192,7 @@
               "value": 10000,
               "step": 1,
               "siPrefix": true,
+               "compactHeight": false,
               "param": [
                  "s-h",
                  "ch",
@ -199,6 +208,7 @@
               "value": 3950,
               "step": 1,
               "decimals": 4,
+               "compactHeight": false,
               "param": [
                  "s-h",
                  "ch",
@ -242,6 +252,7 @@
               "type": "float",
               "step": 0.1,
               "suffix": "",
+               "compactHeight": false,
               "param": [
                  "pid",
                  "ch",
@ -255,6 +266,7 @@
               "title": "Ki (Hz)",
               "type": "float",
               "step": 0.1,
+               "compactHeight": false,
               "param": [
                  "pid",
                  "ch",
@ -268,6 +280,7 @@
               "title": "Kd (s)",
               "type": "float",
               "step": 0.1,
+               "compactHeight": false,
               "param": [
                  "pid",
                  "ch",
@ -293,6 +306,7 @@
                        2000
                     ],
                     "decimals": 6,
+                     "compactHeight": false,
                     "param": [
                        "pid",
                        "ch",
@ -311,6 +325,7 @@
                        2000
                     ],
                     "decimals": 6,
+                     "compactHeight": false,
                     "param": [
                        "pid",
                        "ch",
@ -323,7 +338,7 @@
            },
            {
               "name": "pid_autotune",
-               "title": "PID Auto Tune",
+               "title": "PID Autotune",
               "expanded": false,
               "type": "group",
               "tip": "Automatically tune PID parameters",
@ -335,6 +350,7 @@
                     "value": 20,
                     "step": 0.1,
                     "format": "{value:.4f}",
+                     "compactHeight": false,
                     "pid_autotune": [
                        "target_temp",
                        "ch"
@ -347,9 +363,10 @@
                     "type": "float",
                     "value": 0,
                     "decimals": 6,
+                     "compactHeight": false,
                     "step": 100,
                     "limits": [
-                        -2000,
+                        0,
                        2000
                     ],
                     "pid_autotune": [
@ -366,6 +383,7 @@
                     "step": 0.1,
                     "prefix": "±",
                     "format": "{value:.4f}",
+                     "compactHeight": false,
                     "pid_autotune": [
                        "temp_swing",
                        "ch"
@ -379,6 +397,7 @@
                     "value": 3.0,
                     "step": 0.1,
                     "format": "{value:.4f}",
+                     "compactHeight": false,
                     "pid_autotune": [
                        "lookback",
                        "ch"
--- a/pytec/tec_qt.py
+++ b/pytec/tec_qt.py
@ -82,7 +82,7 @@ class MainWindow(QtWidgets.QMainWindow):
                [["load"], partial(self.thermostat.load_cfg, ch)],
                [
                    ["pid", "pid_autotune", "run_pid"],
-                    partial(self.pid_auto_tune_request, ch),
+                    partial(self.pid_autotune_request, ch),
                ],
            ]
            for ch in range(self.NUM_CHANNELS)
@ -262,7 +262,7 @@ class MainWindow(QtWidgets.QMainWindow):
    @asyncSlot(object, object)
    async def send_command(self, param, changes):
        """Translates parameter tree changes into thermostat set_param calls"""
-        ch = param.channel
+        ch = param.value()

        for inner_param, change, data in changes:
            if change == "value":
@ -283,10 +283,10 @@ class MainWindow(QtWidgets.QMainWindow):
                    param.child(*param.childPath(inner_param)).setOpts(lock=False)

                if inner_param.opts.get("pid_autotune", None) is not None:
-                    auto_tuner_param = inner_param.opts["pid_autotune"][0]
+                    autotuner_param = inner_param.opts["pid_autotune"][0]
                    if inner_param.opts["pid_autotune"][1] != "ch":
                        ch = inner_param.opts["pid_autotune"][1]
-                    self.autotuners.set_params(auto_tuner_param, ch, data)
+                    self.autotuners.set_params(autotuner_param, ch, data)

                if inner_param.opts.get("activaters", None) is not None:
                    activater = inner_param.opts["activaters"][
@ -298,7 +298,7 @@ class MainWindow(QtWidgets.QMainWindow):
                        await self.client.set_param(*activater)

    @asyncSlot()
-    async def pid_auto_tune_request(self, ch=0):
+    async def pid_autotune_request(self, ch=0):
        match self.autotuners.get_state(ch):
            case PIDAutotuneState.STATE_OFF | PIDAutotuneState.STATE_FAILED:
                self.autotuners.load_params_and_set_ready(ch)
Author	SHA1	Message	Date
atse	e1fdc86e40	ctrl_panel: Keep i_set visible when PID engaged Since i_set is also plotted, we would also want to see its precise value too.	2024-07-19 14:50:11 +08:00
atse	89b908fab1	ctrl_panel: Remove MutexParameter Use the standard ListParamenter instead, and hook up UI changes elsewhere.	2024-07-19 14:50:11 +08:00
atse	a1c260d52e	ctrl_panel: Limits fixes * PID Autotune test current should be positive * Maximum absolute voltage should be 4 V not 5 V	2024-07-19 14:50:06 +08:00
atse	d76e015893	ctrl_panel: Code cleanup * Remove unnecessary duplication of `THERMOSTAT_PARAMETERS` * i -> ch * Separate ParameterTree and Parameter initiation * Remove extra "channel" option to root parameters, as the "value" option is already the channel number	2024-07-19 11:27:22 +08:00
atse	c4eb1a2eef	ctrl_panel: PID Auto Tune -> PID Autotune	2024-07-19 11:12:54 +08:00
atse	39018d2360	ctrl_panel: Stop crushing spinboxes It might not be the case on some themes, but on the default Qt theme the spinbox are a bit too short for the containing numbers. See https://github.com/pyqtgraph/pyqtgraph/issues/701.	2024-07-19 11:12:52 +08:00
atse	25c7a070d9	ctrl_panel: Approriate units for measured current Allow the readonly display of current to vary its SI prefix in the unit, since as a display entry it won't have the unit adjustment problem.	2024-07-19 11:12:40 +08:00