dcscope 2.26.2__tar.gz → 2.27.0__tar.gz

{dcscope-2.26.2 → dcscope-2.27.0}/.github/workflows/check.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.13']
         os: [macos-latest, ubuntu-latest, windows-latest]
     env:
       # Display must be available globally for linux to know where xvfb is
@@ -47,7 +47,9 @@ jobs:
       run: |
         # prerequisites
         python -m pip install --upgrade pip wheel
-        python -m pip install coverage flake8
+        python -m pip install flake8
+        # https://github.com/coveragepy/coveragepy/issues/2166
+        python -m pip install "coverage==7.5.3"
         # install dependencies
         pip install .
         pip install -r tests/requirements.txt

{dcscope-2.26.2 → dcscope-2.27.0}/.github/workflows/deploy_github.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.13"]
         # macOS builds not working (on some devices?), and/or there is
         # some kind of security block in place which prevents users
         # from dragging the executable to the Applications folder.

{dcscope-2.26.2 → dcscope-2.27.0}/.github/workflows/deploy_pypi.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@main
       with:
-        python-version: "3.10"
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

{dcscope-2.26.2 → dcscope-2.27.0}/CHANGELOG

@@ -1,3 +1,27 @@
+2.27.0
+ - fix: delay on selecting "Plot" tab when "Marker hue" was set to "Feature"
+ - fix: switching tabs "View/Features" in QuickView did not update event data
+ - fix: set NaN-valued KDE of scatter plot points to zero
+ - fix: properly close DCOR search background runner in dialog
+ - fix: properly stop `EventGetterThread` on exit
+ - fix: due to race condition, sometimes incorrect range was shown in Plot tab
+ - enh: give all separate `QThread` object a name
+ - enh: remove wait cursor from some methods in QuickView
+ - enh: add "default KDE spacing" checkable button in AnalysisView Plot
+   ("auto spacing" in pipeline `Plot` class)
+ - enh: change "auto range" checkbox to "default XY range" checkable button
+   in AnalysisView Plot
+ - ref: migrate from loading .ui files to pyuic6-pregenerated Python files
+ - ref: migrate check for range from `PipelinePlot.update_content`
+   to `Pipeline.check_auto_range_and_spacing`
+ - setup: bump dclab to 0.71.7 (ValueError when encountering empty pipeline)
+ - ci: bump build pipeline to Python 3.13
+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
+ - ref: new `qv_event_getter` and `qv_image_vis` submodules
+ - setup: bump dclab to 0.71.6 (disable file locking, improved DCOR support,
+   IndexError during plotting)
 2.26.2
  - reg: filters not applied in final plots since 2.25.1
  - fix: prevent `pipeline.lock` deadlocks via Qt signal cluttering

{dcscope-2.26.2 → dcscope-2.27.0}/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-2.26.2/dcscope.egg-info → dcscope-2.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.26.2
+Version: 2.27.0
 Summary: User interface for deformability cytometry (DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maximilian Schlögel, Paul Müller, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>
@@ -16,7 +16,7 @@ Classifier: Intended Audience :: Science/Research
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: dclab[dcor,export,http,s3]>=0.71.2
+Requires-Dist: dclab[dcor,export,http,s3]>=0.71.7
 Requires-Dist: h5py>=2.8.0
 Requires-Dist: numpy>=1.21
 Requires-Dist: pygments

{dcscope-2.26.2 → dcscope-2.27.0}/dcscope/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.26.2'
-__version_tuple__ = version_tuple = (2, 26, 2)
+__version__ = version = '2.27.0'
+__version_tuple__ = version_tuple = (2, 27, 0)
 
-__commit_id__ = commit_id = 'ga09ea9064'
+__commit_id__ = commit_id = 'g762a62993'

{dcscope-2.26.2 → dcscope-2.27.0}/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 @@ class BasinsPanel(QtWidgets.QWidget):
     @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 @@ class BasinsPanel(QtWidgets.QWidget):
                 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 @@ class BasinsPanel(QtWidgets.QWidget):
                                      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 @@ class BasinsPanel(QtWidgets.QWidget):
         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-2.27.0/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"))

{dcscope-2.26.2 → dcscope-2.27.0}/dcscope/gui/analysis/ana_filter.py

@@ -1,11 +1,10 @@
-import importlib.resources
-
-from PyQt6 import uic, QtCore, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 import dclab
 
-from ..widgets import RangeControl
 from ... import idiom
+from ..widgets import RangeControl
+from .ana_filter_ui import Ui_Form
 
 
 class FilterPanel(QtWidgets.QWidget):
@@ -28,10 +27,10 @@ class FilterPanel(QtWidgets.QWidget):
 
     def __init__(self, *args, **kwargs):
         super(FilterPanel, self).__init__(*args, **kwargs)
-        ref = importlib.resources.files(
-            "dcscope.gui.analysis") / "ana_filter.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
 
@@ -41,28 +40,29 @@ class FilterPanel(QtWidgets.QWidget):
         self._populate_box_filters()
         self._polygon_checkboxes = {}
         self.update_polygon_filters()
-        self.toolButton_duplicate.clicked.connect(self.on_duplicate_filter)
-        self.toolButton_remove.clicked.connect(self.on_remove_filter)
-        self.pushButton_apply.clicked.connect(self.write_filter)
-        self.pushButton_reset.clicked.connect(self.update_content)
+        self.ui.toolButton_duplicate.clicked.connect(self.on_duplicate_filter)
+        self.ui.toolButton_remove.clicked.connect(self.on_remove_filter)
+        self.ui.pushButton_apply.clicked.connect(self.write_filter)
+        self.ui.pushButton_reset.clicked.connect(self.update_content)
 
         # polygon buttons
-        self.pushButton_polygon_add.clicked.connect(
+        self.ui.pushButton_polygon_add.clicked.connect(
             self.request_new_polygon_filter)
-        self.pushButton_polygon_edit.clicked.connect(
+        self.ui.pushButton_polygon_edit.clicked.connect(
             self.on_polygon_edit)
-        self.pushButton_polygon_duplicate.clicked.connect(
+        self.ui.pushButton_polygon_duplicate.clicked.connect(
             self.on_polygon_duplicate)
-        self.pushButton_polygon_remove.clicked.connect(
+        self.ui.pushButton_polygon_remove.clicked.connect(
             self.on_polygon_remove)
 
         # polygon selection
-        self.listWidget_polygon.itemSelectionChanged.connect(
+        self.ui.listWidget_polygon.itemSelectionChanged.connect(
             self.on_polygon_selection)
 
-        self.comboBox_filters.currentIndexChanged.connect(self.update_content)
-        self.toolButton_moreless.clicked.connect(self.on_moreless)
-        self.label_box_edit.setVisible(False)
+        self.ui.comboBox_filters.currentIndexChanged.connect(
+            self.update_content)
+        self.ui.toolButton_moreless.clicked.connect(self.on_moreless)
+        self.ui.label_box_edit.setVisible(False)
         self._box_edit_view = False
         self.setUpdatesEnabled(True)
 
@@ -71,12 +71,12 @@ class FilterPanel(QtWidgets.QWidget):
     def read_filter_state(self):
         """Read filter state from UI"""
         state = {
-            "filter used": self.checkBox_enable.isChecked(),
+            "filter used": self.ui.checkBox_enable.isChecked(),
             "identifier": self.current_filter.identifier,
-            "limit events bool": self.checkBox_limit.isChecked(),
-            "limit events num": self.spinBox_limit.value(),
-            "name": self.lineEdit_name.text(),
-            "remove invalid events": self.checkBox_invalid.isChecked(),
+            "limit events bool": self.ui.checkBox_limit.isChecked(),
+            "limit events num": self.ui.spinBox_limit.value(),
+            "name": self.ui.lineEdit_name.text(),
+            "remove invalid events": self.ui.checkBox_invalid.isChecked(),
         }
         # box filters
         box = {}
@@ -103,11 +103,11 @@ class FilterPanel(QtWidgets.QWidget):
         """Write filter state to UI"""
         if self.current_filter.identifier != state["identifier"]:
             raise ValueError("Filter identifier mismatch!")
-        self.checkBox_enable.setChecked(state["filter used"])
-        self.lineEdit_name.setText(state["name"])
-        self.checkBox_limit.setChecked(state["limit events bool"])
-        self.spinBox_limit.setValue(state["limit events num"])
-        self.checkBox_invalid.setChecked(state["remove invalid events"])
+        self.ui.checkBox_enable.setChecked(state["filter used"])
+        self.ui.lineEdit_name.setText(state["name"])
+        self.ui.checkBox_limit.setChecked(state["limit events bool"])
+        self.ui.spinBox_limit.setValue(state["limit events num"])
+        self.ui.checkBox_invalid.setChecked(state["remove invalid events"])
         # box filters
         box = state["box filters"]
         for feat in self._box_range_controls:
@@ -142,7 +142,8 @@ class FilterPanel(QtWidgets.QWidget):
         """
         feats, labs = self.get_features_labels()
 
-        self.verticalLayout_box.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
+        self.ui.verticalLayout_box.setAlignment(
+            QtCore.Qt.AlignmentFlag.AlignTop)
 
         for lab, feat in sorted(zip(labs, feats)):
             integer = True if feat in idiom.INTEGER_FEATURES else False
@@ -160,7 +161,7 @@ class FilterPanel(QtWidgets.QWidget):
                 rcf = list(self._box_range_controls.keys())
                 rcl = [dclab.dfn.get_feature_label(ft) for ft in rcf]
                 index = sorted(rcl + [lab]).index(lab)
-                self.verticalLayout_box.insertWidget(index, rc)
+                self.ui.verticalLayout_box.insertWidget(index, rc)
                 self._box_range_controls[feat] = rc
 
     @property
@@ -175,7 +176,7 @@ class FilterPanel(QtWidgets.QWidget):
     @property
     def current_filter(self):
         if self.filter_ids:
-            filt_index = self.comboBox_filters.currentIndex()
+            filt_index = self.ui.comboBox_filters.currentIndex()
             filt = self.pipeline.filters[filt_index]
         else:
             filt = None
@@ -215,7 +216,7 @@ class FilterPanel(QtWidgets.QWidget):
 
     def get_polygon_filter_selection(self):
         """Return selected polygon filters"""
-        items = self.listWidget_polygon.selectedItems()
+        items = self.ui.listWidget_polygon.selectedItems()
         pfs = []
         pf_ids = []
         for (pfid, item) in self._polygon_checkboxes.items():
@@ -226,12 +227,12 @@ class FilterPanel(QtWidgets.QWidget):
 
     @QtCore.pyqtSlot()
     def on_polygon_selection(self):
-        num_selected = len(self.listWidget_polygon.selectedItems())
+        num_selected = len(self.ui.listWidget_polygon.selectedItems())
         if num_selected == 0:
-            self.widget_selection.setEnabled(False)
+            self.ui.widget_selection.setEnabled(False)
         else:
-            self.widget_selection.setEnabled(True)
-            self.pushButton_polygon_edit.setEnabled(num_selected == 1)
+            self.ui.widget_selection.setEnabled(True)
+            self.ui.pushButton_polygon_edit.setEnabled(num_selected == 1)
 
     @QtCore.pyqtSlot()
     def on_polygon_duplicate(self):
@@ -323,24 +324,24 @@ class FilterPanel(QtWidgets.QWidget):
             for feat, rc in self._box_range_controls.items():
                 if feat in features:
                     rc.setVisible(True)
-                    rc.checkBox.setVisible(True)
-                    rc.doubleSpinBox_min.setEnabled(False)
-                    rc.doubleSpinBox_max.setEnabled(False)
-                    rc.range_slider.setEnabled(False)
-            self.toolButton_moreless.setText("...Finish editing")
-            self.label_box_edit.setVisible(True)
+                    rc.ui.checkBox.setVisible(True)
+                    rc.ui.doubleSpinBox_min.setEnabled(False)
+                    rc.ui.doubleSpinBox_max.setEnabled(False)
+                    rc.ui.range_slider.setEnabled(False)
+            self.ui.toolButton_moreless.setText("...Finish editing")
+            self.ui.label_box_edit.setVisible(True)
             self._box_edit_view = True
         else:
             # Hide all filters that are not active
             for _, rc in self._box_range_controls.items():
                 if not rc.is_active():
                     rc.setVisible(False)
-                rc.checkBox.setVisible(False)
-                rc.doubleSpinBox_min.setEnabled(True)
-                rc.doubleSpinBox_max.setEnabled(True)
-                rc.range_slider.setEnabled(True)
-            self.toolButton_moreless.setText("Choose filters...")
-            self.label_box_edit.setVisible(False)
+                rc.ui.checkBox.setVisible(False)
+                rc.ui.doubleSpinBox_min.setEnabled(True)
+                rc.ui.doubleSpinBox_max.setEnabled(True)
+                rc.ui.range_slider.setEnabled(True)
+            self.ui.toolButton_moreless.setText("Choose filters...")
+            self.ui.label_box_edit.setVisible(False)
             self._box_edit_view = False
             # Update box filter ranges
             self.update_box_ranges()
@@ -357,24 +358,24 @@ class FilterPanel(QtWidgets.QWidget):
     def update_content(self, filt_index=None, **kwargs):
         if self.pipeline and self.pipeline.filters:
             # remember the previous filter index and make sure it is sane
-            prev_index = self.comboBox_filters.currentIndex()
+            prev_index = self.ui.comboBox_filters.currentIndex()
             if prev_index is None or prev_index < 0:
                 prev_index = len(self.filter_ids) - 1
 
             self.setEnabled(True)
             self.update_polygon_filters()
             # update combobox
-            self.comboBox_filters.blockSignals(True)
+            self.ui.comboBox_filters.blockSignals(True)
             if filt_index is None or filt_index < 0:
                 # fallback to previous filter index
                 filt_index = prev_index
             filt_index = min(filt_index, len(self.filter_ids) - 1)
 
-            self.comboBox_filters.clear()
-            self.comboBox_filters.addItems(
+            self.ui.comboBox_filters.clear()
+            self.ui.comboBox_filters.addItems(
                 [filt.name for filt in self.pipeline.filters])
-            self.comboBox_filters.setCurrentIndex(filt_index)
-            self.comboBox_filters.blockSignals(False)
+            self.ui.comboBox_filters.setCurrentIndex(filt_index)
+            self.ui.comboBox_filters.blockSignals(False)
             # populate content
             filt = self.pipeline.filters[filt_index]
             state = filt.__getstate__()
@@ -407,25 +408,25 @@ class FilterPanel(QtWidgets.QWidget):
     def update_polygon_filters(self):
         """Update the layout containing the polygon filters"""
         # clear layout
-        for _ in range(self.listWidget_polygon.count()):
-            self.listWidget_polygon.takeItem(0)
+        for _ in range(self.ui.listWidget_polygon.count()):
+            self.ui.listWidget_polygon.takeItem(0)
 
         self._polygon_checkboxes = {}  # must come after getting the state
         if dclab.PolygonFilter.instances:
-            self.listWidget_polygon.setEnabled(True)
+            self.ui.listWidget_polygon.setEnabled(True)
             for pf in dclab.PolygonFilter.instances:
                 item = QtWidgets.QListWidgetItem(pf.name)
                 item.setFlags(
                     item.flags() | QtCore.Qt.ItemFlag.ItemIsUserCheckable)
                 item.setCheckState(QtCore.Qt.CheckState.Unchecked)
-                self.listWidget_polygon.addItem(item)
+                self.ui.listWidget_polygon.addItem(item)
                 item.setToolTip(f"{pf.unique_id}: {pf.name}")
                 self._polygon_checkboxes[pf.unique_id] = item
         else:
-            self.listWidget_polygon.addItem(
+            self.ui.listWidget_polygon.addItem(
                 "No polygon filters have been created yet.")
-            self.listWidget_polygon.setEnabled(False)
-            self.widget_selection.setEnabled(False)
+            self.ui.listWidget_polygon.setEnabled(False)
+            self.ui.widget_selection.setEnabled(False)
 
         if self.current_filter is not None:
             filt_id = self.current_filter.identifier