ref: migrate from loading .ui files to pyuic6-pregenerated Python files

Author: paulmueller

CHANGELOG

@@ -1,6 +1,7 @@
-2.26.4
+2.27.0
  - setup: bump dclab to 0.71.7 (ValueError when encountering empty pipeline)
  - ci: bump build pipeline to Python 3.13
+ - ref: migrate from loading .ui files to pyuic6-pregenerated Python files
 2.26.3
  - enh: fetch QuickView image and trace data in `EventGetterThread`
  - enh: busy indicator in QuickView when event data is fetched in the background

MANIFEST.in

@@ -3,4 +3,4 @@ include LICENSE
 include README.rst
 recursive-include examples *.py
 recursive-include tests *.py
-recursive-include dcscope *.css *.png *.py *.svg *.theme *.ui COPYING* LICENSE README
+recursive-include dcscope *.css *.png *.py *.svg *.theme COPYING* LICENSE README

dcscope/gui/analysis/ana_basins.py

@@ -1,8 +1,9 @@
-import importlib.resources
 import json
 
 from pygments import highlight, lexers, formatters
-from PyQt6 import uic, QtCore, QtWidgets
+from PyQt6 import QtCore, QtWidgets
+
+from .ana_basins_ui import Ui_Form
 
 
 class BasinsPanel(QtWidgets.QWidget):
@@ -17,18 +18,18 @@ class BasinsPanel(QtWidgets.QWidget):
 
     def __init__(self, *args, **kwargs):
         super(BasinsPanel, self).__init__(*args, **kwargs)
-        ref = importlib.resources.files(
-            "dcscope.gui.analysis") / "ana_basins.ui"
-        with importlib.resources.as_file(ref) as path_ui:
-            uic.loadUi(path_ui, self)
+
+        self.ui = Ui_Form()
+        self.ui.setupUi(self)
+
         # current DCscope pipeline
         self.pipeline = None
         self.data_role = QtCore.Qt.ItemDataRole.UserRole + 2
-        self.treeWidget_basin_name.setColumnCount(1)
+        self.ui.treeWidget_basin_name.setColumnCount(1)
 
-        self.listWidget_dataset.currentRowChanged.connect(
+        self.ui.listWidget_dataset.currentRowChanged.connect(
             self.on_select_dataset)
-        self.treeWidget_basin_name.currentItemChanged.connect(
+        self.ui.treeWidget_basin_name.currentItemChanged.connect(
             self.on_select_basin)
 
         self.pp_mod_recv.connect(self.on_pp_mod_recv)
@@ -50,16 +51,16 @@ def on_pp_mod_recv(self, data):
     @QtCore.pyqtSlot(int)
     def on_select_dataset(self, ds_idx):
         """Show the tables of the dataset in the right-hand list widget"""
-        self.treeWidget_basin_name.clear()
+        self.ui.treeWidget_basin_name.clear()
         if ds_idx >= 0:
             ds = self.pipeline.slots[ds_idx].get_dataset()
-            self.add_basin_nodes(parent_widget=self.treeWidget_basin_name,
+            self.add_basin_nodes(parent_widget=self.ui.treeWidget_basin_name,
                                  ds=ds)
 
     @QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem, QtWidgets.QTreeWidgetItem)
     def on_select_basin(self, current, previous=None):
         """Show the tables of the dataset in the right-hand list widget"""
-        ds_idx = self.listWidget_dataset.currentRow()
+        ds_idx = self.ui.listWidget_dataset.currentRow()
         if current is not None and ds_idx >= 0:
             # Get the correct basin
             ds, bd = current.data(0, self.data_role)
@@ -76,9 +77,9 @@ def on_select_basin(self, current, previous=None):
                 bn = None
 
             # Display the basin information
-            self.label_status.setText(f"{loaded=}, {available=}")
-            self.label_id.setText(f"{bd.get('name')} ({bd['key']})")
-            self.textEdit_def.setText(
+            self.ui.label_status.setText(f"{loaded=}, {available=}")
+            self.ui.label_id.setText(f"{bd.get('name')} ({bd['key']})")
+            self.ui.textEdit_def.setText(
                 highlight(json.dumps(bd, sort_keys=True, indent=2),
                           lexers.JsonLexer(),
                           formatters.HtmlFormatter(full=True,
@@ -92,9 +93,9 @@ def on_select_basin(self, current, previous=None):
                                      ds=bn.ds)
                 current.setExpanded(True)
         else:
-            self.textEdit_def.clear()
-            self.label_status.setText("")
-            self.label_id.setText("")
+            self.ui.textEdit_def.clear()
+            self.ui.label_status.setText("")
+            self.ui.label_id.setText("")
 
     def set_pipeline(self, pipeline):
         if self.pipeline is not None:
@@ -105,16 +106,16 @@ def update_content(self, slot_index=None, **kwargs):
         if self.pipeline and self.pipeline.slots:
             self.setEnabled(True)
             self.setUpdatesEnabled(False)
-            self.listWidget_dataset.clear()
-            self.treeWidget_basin_name.clear()
+            self.ui.listWidget_dataset.clear()
+            self.ui.treeWidget_basin_name.clear()
             for name in self.pipeline.deduce_display_names():
-                self.listWidget_dataset.addItem(name)
+                self.ui.listWidget_dataset.addItem(name)
             self.setUpdatesEnabled(True)
             if slot_index is None or slot_index < 0:
-                slot_index = max(0, self.listWidget_dataset.currentRow())
+                slot_index = max(0, self.ui.listWidget_dataset.currentRow())
             slot_index = min(slot_index, self.pipeline.num_slots - 1)
-            self.listWidget_dataset.setCurrentRow(slot_index)
+            self.ui.listWidget_dataset.setCurrentRow(slot_index)
         else:
             self.setEnabled(False)
-            self.listWidget_dataset.clear()
-            self.treeWidget_basin_name.clear()
+            self.ui.listWidget_dataset.clear()
+            self.ui.treeWidget_basin_name.clear()

dcscope/gui/analysis/ana_basins_ui.py

@@ -0,0 +1,93 @@
+# flake8: noqa
+# This file was auto-generated with DCscope/ui/run_uic.sh.
+# Form implementation generated from reading ui file './analysis/ana_basins.ui'
+#
+# Created by: PyQt6 UI code generator 6.11.0
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(701, 538)
+        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.label = QtWidgets.QLabel(parent=Form)
+        self.label.setObjectName("label")
+        self.verticalLayout_2.addWidget(self.label)
+        self.listWidget_dataset = QtWidgets.QListWidget(parent=Form)
+        self.listWidget_dataset.setMinimumSize(QtCore.QSize(200, 0))
+        self.listWidget_dataset.setProperty("showDropIndicator", False)
+        self.listWidget_dataset.setAlternatingRowColors(True)
+        self.listWidget_dataset.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.listWidget_dataset.setObjectName("listWidget_dataset")
+        self.verticalLayout_2.addWidget(self.listWidget_dataset)
+        self.horizontalLayout.addLayout(self.verticalLayout_2)
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout()
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.label_2 = QtWidgets.QLabel(parent=Form)
+        self.label_2.setObjectName("label_2")
+        self.verticalLayout_3.addWidget(self.label_2)
+        self.treeWidget_basin_name = QtWidgets.QTreeWidget(parent=Form)
+        self.treeWidget_basin_name.setProperty("showDropIndicator", False)
+        self.treeWidget_basin_name.setAlternatingRowColors(True)
+        self.treeWidget_basin_name.setAutoExpandDelay(0)
+        self.treeWidget_basin_name.setUniformRowHeights(True)
+        self.treeWidget_basin_name.setHeaderHidden(True)
+        self.treeWidget_basin_name.setObjectName("treeWidget_basin_name")
+        self.treeWidget_basin_name.headerItem().setText(0, "1")
+        self.verticalLayout_3.addWidget(self.treeWidget_basin_name)
+        self.horizontalLayout.addLayout(self.verticalLayout_3)
+        self.horizontalLayout.setStretch(1, 1)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.line = QtWidgets.QFrame(parent=Form)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        self.line.setObjectName("line")
+        self.verticalLayout.addWidget(self.line)
+        self.formLayout = QtWidgets.QFormLayout()
+        self.formLayout.setObjectName("formLayout")
+        self.label_3 = QtWidgets.QLabel(parent=Form)
+        self.label_3.setObjectName("label_3")
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
+        self.label_id = QtWidgets.QLabel(parent=Form)
+        self.label_id.setText("")
+        self.label_id.setObjectName("label_id")
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.label_id)
+        self.label_6 = QtWidgets.QLabel(parent=Form)
+        self.label_6.setObjectName("label_6")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_6)
+        self.label_5 = QtWidgets.QLabel(parent=Form)
+        self.label_5.setObjectName("label_5")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_5)
+        self.textEdit_def = QtWidgets.QTextEdit(parent=Form)
+        self.textEdit_def.setReadOnly(True)
+        self.textEdit_def.setObjectName("textEdit_def")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.textEdit_def)
+        self.label_status = QtWidgets.QLabel(parent=Form)
+        self.label_status.setText("")
+        self.label_status.setObjectName("label_status")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.label_status)
+        self.verticalLayout.addLayout(self.formLayout)
+        self.verticalLayout.setStretch(2, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.label.setText(_translate("Form", "Dataset"))
+        self.label_2.setText(_translate("Form", "Basins"))
+        self.label_3.setText(_translate("Form", "Basin"))
+        self.label_6.setText(_translate("Form", "Status"))
+        self.label_5.setText(_translate("Form", "Definition"))