From 3ed181403ffefa633a032327250bfa190afc330f Mon Sep 17 00:00:00 2001 From: atse Date: Thu, 1 Aug 2024 15:49:45 +0800 Subject: [PATCH] ctrl_panel: Move postfilter into its own group --- pytec/pytec/gui/view/ctrl_panel.py | 2 +- pytec/pytec/gui/view/param_tree.json | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pytec/pytec/gui/view/ctrl_panel.py b/pytec/pytec/gui/view/ctrl_panel.py index bff2f67..e8406e8 100644 --- a/pytec/pytec/gui/view/ctrl_panel.py +++ b/pytec/pytec/gui/view/ctrl_panel.py @@ -166,6 +166,6 @@ class CtrlPanel(QObject): for postfilter_params in postfilter_data: channel = postfilter_params["channel"] with QSignalBlocker(self.params[channel]): - self.params[channel].child("thermistor", "rate").set_value_with_lock( + self.params[channel].child("postfilter", "rate").set_value_with_lock( postfilter_params["rate"] ) diff --git a/pytec/pytec/gui/view/param_tree.json b/pytec/pytec/gui/view/param_tree.json index 624b880..f236fa9 100644 --- a/pytec/pytec/gui/view/param_tree.json +++ b/pytec/pytec/gui/view/param_tree.json @@ -186,7 +186,7 @@ "title": "Thermistor Settings", "expanded": true, "type": "group", - "tip": "Settings of the connected thermistor\n- Parameters for the resistance to temperature conversion (with the B-Parameter equation)\n- Settings for the 50/60 Hz filter with the thermistor", + "tip": "Parameters for the resistance to temperature conversion with the B-Parameter equation", "children": [ { "name": "t0", @@ -247,10 +247,18 @@ ], "tip": "The Beta Parameter", "lock": false - }, + } + ] + }, + { + "name": "postfilter", + "title": "50/60 Hz filter settings", + "type": "group", + "tip": "Settings for the 50/60 Hz filter with the thermistor", + "children": [ { "name": "rate", - "title": "50/60 Hz filter rejection", + "title": "Rejection", "type": "list", "value": 16.67, "param": [