From 6f590400fe6a24aeb6d0e08604ea796e8cfa9d81 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 19 Mar 2024 11:03:54 +0800 Subject: [PATCH] applets: subclass EntryArea as EntryTreeWidget --- artiq/gui/applets.py | 116 ++++--------------------------------------- 1 file changed, 9 insertions(+), 107 deletions(-) diff --git a/artiq/gui/applets.py b/artiq/gui/applets.py index de282c846..adcd2674f 100644 --- a/artiq/gui/applets.py +++ b/artiq/gui/applets.py @@ -14,43 +14,16 @@ from sipyco.pipe_ipc import AsyncioParentComm from sipyco.logging_tools import LogParser from sipyco import pyon -from artiq.gui.entries import procdesc_to_entry -from artiq.gui.tools import (QDockWidgetCloseDetect, LayoutWidget, - WheelFilter) +from artiq.gui.entries import procdesc_to_entry, EntryTreeWidget +from artiq.gui.tools import QDockWidgetCloseDetect, LayoutWidget logger = logging.getLogger(__name__) -class EntryArea(QtWidgets.QTreeWidget): + +class EntryArea(EntryTreeWidget): def __init__(self): - QtWidgets.QTreeWidget.__init__(self) - self.setColumnCount(3) - self.header().setStretchLastSection(False) - if hasattr(self.header(), "setSectionResizeMode"): - set_resize_mode = self.header().setSectionResizeMode - else: - set_resize_mode = self.header().setResizeMode - set_resize_mode(0, QtWidgets.QHeaderView.ResizeToContents) - set_resize_mode(1, QtWidgets.QHeaderView.Stretch) - self.header().setVisible(False) - self.setSelectionMode(self.NoSelection) - self.setHorizontalScrollMode(self.ScrollPerPixel) - self.setVerticalScrollMode(self.ScrollPerPixel) - - self.setStyleSheet("QTreeWidget {background: " + - self.palette().midlight().color().name() + " ;}") - - self.viewport().installEventFilter(WheelFilter(self.viewport(), True)) - - self._groups = dict() - self._arg_to_widgets = dict() - self._arguments = dict() - - self.gradient = QtGui.QLinearGradient( - 0, 0, 0, QtGui.QFontMetrics(self.font()).lineSpacing()*2.5) - self.gradient.setColorAt(0, self.palette().base().color()) - self.gradient.setColorAt(1, self.palette().midlight().color()) - + EntryTreeWidget.__init__(self) reset_all_button = QtWidgets.QPushButton("Restore defaults") reset_all_button.setToolTip("Reset all to default values") reset_all_button.setIcon( @@ -62,10 +35,7 @@ class EntryArea(QtWidgets.QTreeWidget): buttons.layout.setColumnStretch(1, 0) buttons.layout.setColumnStretch(2, 1) buttons.addWidget(reset_all_button, 0, 1) - self.bottom_item = QtWidgets.QTreeWidgetItem() - self.addTopLevelItem(self.bottom_item) self.setItemWidget(self.bottom_item, 1, buttons) - self.bottom_item.setHidden(True) def setattr_argument(self, key, processor, group=None, tooltip=None): argument = dict() @@ -73,61 +43,7 @@ class EntryArea(QtWidgets.QTreeWidget): argument["desc"] = desc argument["group"] = group argument["tooltip"] = tooltip - self._arguments[key] = argument - widgets = dict() - self._arg_to_widgets[key] = widgets - entry_class = procdesc_to_entry(argument["desc"]) - argument["state"] = entry_class.default_state(argument["desc"]) - entry = entry_class(argument) - widget_item = QtWidgets.QTreeWidgetItem([key]) - if argument["tooltip"]: - widget_item.setToolTip(0, argument["tooltip"]) - widgets["entry"] = entry - widgets["widget_item"] = widget_item - - if len(self._arguments) > 1: - self.bottom_item.setHidden(False) - - for col in range(3): - widget_item.setBackground(col, self.gradient) - font = widget_item.font(0) - font.setBold(True) - widget_item.setFont(0, font) - - if argument["group"] is None: - self.insertTopLevelItem(self.indexFromItem(self.bottom_item).row(), widget_item) - else: - self._get_group(argument["group"]).addChild(widget_item) - self.bottom_item.setHidden(False) - fix_layout = LayoutWidget() - widgets["fix_layout"] = fix_layout - fix_layout.addWidget(entry) - self.setItemWidget(widget_item, 1, fix_layout) - - reset_value = QtWidgets.QToolButton() - reset_value.setToolTip("Reset to default value") - reset_value.setIcon( - QtWidgets.QApplication.style().standardIcon( - QtWidgets.QStyle.SP_BrowserReload)) - reset_value.clicked.connect(partial(self.reset_value, key)) - - tool_buttons = LayoutWidget() - tool_buttons.addWidget(reset_value, 0) - self.setItemWidget(widget_item, 2, tool_buttons) - - def _get_group(self, key): - if key in self._groups: - return self._groups[key] - group = QtWidgets.QTreeWidgetItem([key]) - for col in range(3): - group.setBackground(col, self.palette().mid()) - group.setForeground(col, self.palette().brightText()) - font = group.font(col) - font.setBold(True) - group.setFont(col, font) - self.insertTopLevelItem(self.indexFromItem(self.bottom_item).row(), group) - self._groups[key] = group - return group + self.set_argument(key, argument) def __getattr__(self, key): return self.get_value(key) @@ -158,29 +74,15 @@ class EntryArea(QtWidgets.QTreeWidget): self.set_value(key, value) def update_value(self, key): - widgets = self._arg_to_widgets[key] argument = self._arguments[key] - - # Qt needs a setItemWidget() to handle layout correctly, - # simply replacing the entry inside the LayoutWidget - # results in a bug. - - widgets["entry"].deleteLater() - widgets["entry"] = procdesc_to_entry(argument["desc"])(argument) - widgets["fix_layout"].deleteLater() - widgets["fix_layout"] = LayoutWidget() - widgets["fix_layout"].addWidget(widgets["entry"]) - self.setItemWidget(widgets["widget_item"], 1, widgets["fix_layout"]) - self.updateGeometries() + self.update_argument(key, argument) def reset_value(self, key): - procdesc = self._arguments[key]["desc"] - self._arguments[key]["state"] = procdesc_to_entry(procdesc).default_state(procdesc) - self.update_value(key) + self.reset_entry(key) def reset_all(self): for key in self._arguments.keys(): - self.reset_value(key) + self.reset_entry(key) class AppletIPCServer(AsyncioParentComm):