From d70ba8aaa0ec46b78350141e0cdd0fe99da8f254 Mon Sep 17 00:00:00 2001 From: atse Date: Wed, 17 Jul 2024 17:05:07 +0800 Subject: [PATCH] send_command: Code cleanup * alias `data` as `new_value` once change is known to be the value * Remove unneccessary redirection: The child at inner_param's childpath to the root parameter... is just inner_param. * Use `in` syntax for checking key existance in `dict` --- pytec/tec_qt.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pytec/tec_qt.py b/pytec/tec_qt.py index c29ebb6..b022e45 100644 --- a/pytec/tec_qt.py +++ b/pytec/tec_qt.py @@ -266,29 +266,32 @@ class MainWindow(QtWidgets.QMainWindow): for inner_param, change, data in changes: if change == "value": - if inner_param.opts.get("param", None) is not None: + new_value = data + if "thermostat:set_param" in inner_param.opts: + thermostat_param = inner_param.opts["thermostat:set_param"] + if inner_param.opts.get("title", None).endswith(" (mA)"): - data /= 1000 # Given in mA + new_value /= 1000 # Given in mA thermostat_param = inner_param.opts["param"] if thermostat_param[1] == "ch": thermostat_param[1] = ch - if inner_param.name() == "rate" and data is None: + if inner_param.name() == "rate" and new_value is None: set_param_args = (*thermostat_param[:2], "off") else: - set_param_args = (*thermostat_param, data) - param.child(*param.childPath(inner_param)).setOpts(lock=True) + set_param_args = (*thermostat_param, new_value) + inner_param.setOpts(lock=True) await self.client.set_param(*set_param_args) - param.child(*param.childPath(inner_param)).setOpts(lock=False) + inner_param.setOpts(lock=False) - if inner_param.opts.get("pid_autotune", None) is not None: + if "pid_autotune" in inner_param.opts: 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(autotuner_param, ch, data) - if inner_param.opts.get("activaters", None) is not None: + if "activaters" in inner_param.opts: activater = inner_param.opts["activaters"][ inner_param.reverse[0].index(data) # ListParameter.reverse = list of codename values ]