From efe6e4e10e29cdc045f298def8d2c38c21ad1d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Augusto=20Rosa=20Feltran?= Date: Tue, 8 Oct 2024 13:49:49 -0300 Subject: [PATCH 1/2] Modified tree structure to include RF PVs inside BO and SI --- pyqt-apps/siriushla/widgets/pvnames_tree.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pyqt-apps/siriushla/widgets/pvnames_tree.py b/pyqt-apps/siriushla/widgets/pvnames_tree.py index d0942ae38..b5f6aac12 100644 --- a/pyqt-apps/siriushla/widgets/pvnames_tree.py +++ b/pyqt-apps/siriushla/widgets/pvnames_tree.py @@ -403,6 +403,26 @@ def _add_item(self, item): # parent.addChild(new_item) parent = new_item parent_key = item_key + elif pvname.startswith('RA'): + sec = 'BO' if pvname.startswith('RA-RaBO') else 'SI' + dic_ = {'sec': sec, 'dis': 'RF', 'dev': 'LLRF'} + for p in self._pnames: + key = dic_.get(p, 'LLRF') + if key: + item_key = parent_key + key + # item = self._item_map.symbol(item_key) + item = self._item_map[item_key] \ + if item_key in self._item_map else None + if item is not None: + parent = item + else: + new_item = QTreeItem([key], parent) + new_item.setCheckState(0, Qt.Unchecked) + # self._item_map.add_symbol(item_key, new_item) + self._item_map[item_key] = new_item + # parent.addChild(new_item) + parent = new_item + parent_key = item_key elif isinstance(pvname, SiriusPVName): # Parse it with SiriusPVName pvname = SiriusPVName(pvname) From fa6a80afb9af3914187f47b182f8696068d86b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Augusto=20Rosa=20Feltran?= Date: Tue, 8 Oct 2024 14:05:12 -0300 Subject: [PATCH 2/2] Removed commented code --- pyqt-apps/siriushla/widgets/pvnames_tree.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyqt-apps/siriushla/widgets/pvnames_tree.py b/pyqt-apps/siriushla/widgets/pvnames_tree.py index b5f6aac12..8e42375b5 100644 --- a/pyqt-apps/siriushla/widgets/pvnames_tree.py +++ b/pyqt-apps/siriushla/widgets/pvnames_tree.py @@ -410,7 +410,6 @@ def _add_item(self, item): key = dic_.get(p, 'LLRF') if key: item_key = parent_key + key - # item = self._item_map.symbol(item_key) item = self._item_map[item_key] \ if item_key in self._item_map else None if item is not None: @@ -418,9 +417,7 @@ def _add_item(self, item): else: new_item = QTreeItem([key], parent) new_item.setCheckState(0, Qt.Unchecked) - # self._item_map.add_symbol(item_key, new_item) self._item_map[item_key] = new_item - # parent.addChild(new_item) parent = new_item parent_key = item_key elif isinstance(pvname, SiriusPVName):