dcscope 2.26.1__tar.gz → 2.26.2__tar.gz

{dcscope-2.26.1 → dcscope-2.26.2}/CHANGELOG

@@ -1,3 +1,12 @@
+2.26.2
+ - reg: filters not applied in final plots since 2.25.1
+ - fix: prevent `pipeline.lock` deadlocks via Qt signal cluttering
+ - fix: update axes ranges when "Auto XY-range" is selected in plotting
+ - enh: remember plot size when manually resizing
+ - enh: increase default disk store size from 2GB to 9GB
+ - enh: reduce delay after selecting axes in the Plot view
+ - ref: incorporate `PipelinePlot` into sender-receiver signal pyramid
+ - setup: bump dclab to 0.71.2 (disk-caching of DCOR/HTTP/S3 data)
 2.26.1
  - fix: possibly fix `KeyError` on hover in QuickView by doing a
    `GraphicsScene.hoverItems.clear()` whenever something changes (#205)
@@ -52,7 +61,7 @@
  - enh: improved presentation of multiple datasets with identical sample names
  - ref: tentative `set_pipeline`, so widgets have direct access to the pipeline
  - ref: raise ValueError in unreachable case in DataSlot creation
- - ref: restructure pipeline management through signaling
+ - ref: restructure pipeline management with sender-receiver signal pyramid
  - ref: move slot, plot, and filter duplication to `Pipeline` class
  - ref: refer power to Slot/Plot/Filter creation to `Pipeline`
  - setup: bump pyqtgraph to 0.14.0

{dcscope-2.26.1/dcscope.egg-info → dcscope-2.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcscope
-Version: 2.26.1
+Version: 2.26.2
 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.1
+Requires-Dist: dclab[dcor,export,http,s3]>=0.71.2
 Requires-Dist: h5py>=2.8.0
 Requires-Dist: numpy>=1.21
 Requires-Dist: pygments

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

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

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

@@ -211,7 +211,7 @@ class FilterPanel(QtWidgets.QWidget):
         with self.pipeline.lock:
             filt_id = self.current_filter.identifier
             new_id = self.pipeline.duplicate_filter(filt_id)
-            self.pp_mod_send.emit({"pipeline": {"filter_added": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"filter_added": new_id}})
 
     def get_polygon_filter_selection(self):
         """Return selected polygon filters"""
@@ -309,7 +309,7 @@ class FilterPanel(QtWidgets.QWidget):
         with self.pipeline.lock:
             filt_id = self.current_filter.identifier
             self.pipeline.remove_filter(filt_id)
-            self.pp_mod_send.emit({"pipeline": {"filter_removed": filt_id}})
+        self.pp_mod_send.emit({"pipeline": {"filter_removed": filt_id}})
 
     @QtCore.pyqtSlot()
     def on_moreless(self):
@@ -442,4 +442,4 @@ class FilterPanel(QtWidgets.QWidget):
             filt_id = filter_state["identifier"]
             filt_index = self.pipeline.filter_ids.index(filt_id)
             self.pipeline.filters[filt_index].__setstate__(filter_state)
-            self.pp_mod_send.emit({"pipeline": {"filter_modified": filt_id}})
+        self.pp_mod_send.emit({"pipeline": {"filter_modified": filt_id}})

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/analysis/ana_plot.py

@@ -276,7 +276,7 @@ class PlotPanel(QtWidgets.QWidget):
         else:
             self.setEnabled(True)
         if feat is not None:
-            lim = self.pipeline.get_min_max(
+            lim = self.pipeline.get_min_max_coarse(
                 feat=feat, plot_id=self.current_plot.identifier)
             if not (np.isinf(lim[0]) or np.isinf(lim[1])):
                 self.widget_range_feat.setLimits(vmin=lim[0], vmax=lim[1])
@@ -307,16 +307,19 @@ class PlotPanel(QtWidgets.QWidget):
                                   [self.widget_range_x, self.widget_range_y],
                                   ):
             if axis is not None:
-                lim = self.pipeline.get_min_max(feat=axis, plot_id=plot_id)
+                lim = self.pipeline.get_min_max_coarse(
+                    feat=axis,
+                    plot_id=plot_id)
                 if not (np.isinf(lim[0]) or np.isinf(lim[1])):
                     rc.blockSignals(True)
                     rc.setLimits(vmin=lim[0],
                                  vmax=lim[1])
                     if rang is None or rang[0] == rang[1]:
                         # default range is limits + 5% margin
-                        rang = self.pipeline.get_min_max(feat=axis,
-                                                         plot_id=plot_id,
-                                                         margin=0.05)
+                        rang = self.pipeline.get_min_max_coarse(
+                            feat=axis,
+                            plot_id=plot_id,
+                            margin=0.05)
                     rc.write_pipeline_state({"active": True,
                                              "start": rang[0],
                                              "end": rang[1],
@@ -347,12 +350,9 @@ class PlotPanel(QtWidgets.QWidget):
                 spinBox.setSingleStep(10**(-dec + 1))
                 spinBox.setValue(spacing)
 
-    def _set_kde_spacing_auto(self, axis_x=None, axis_y=None):
+    def _set_kde_spacing_simple(self, axis_x=None, axis_y=None):
         """automatically estimate and set the KDE spacing
 
-        - uses :func:`dclab.kde.binning.bin_width_percentile`
-        - uses _set_kde_spacing
-
         Not to be confused with `on_spacing_auto`!
         """
         if len(self.pipeline.slots) == 0:
@@ -361,32 +361,28 @@ class PlotPanel(QtWidgets.QWidget):
             return
         else:
             self.setEnabled(True)
-        dslist, _ = self.pipeline.get_plot_datasets(
-            self.current_plot.identifier)
-        if dslist:
-            spacings_xy = []
-            for axis, scaleCombo in zip([axis_x, axis_y],
-                                        [self.comboBox_scale_x,
-                                         self.comboBox_scale_y]):
-                if axis is None:
-                    # nothing to do
-                    spacings_xy.append(None)
-                else:
-                    # determine good approximation
-                    spacings = []
-                    for ds in dslist:
-                        spa = ds.get_kde_spacing(
-                            a=ds[axis],
-                            feat=axis,
-                            scale=scaleCombo.currentData(),
-                            method=dclab.kde.binning.bin_width_percentile,
-                        )
-                        spacings.append(spa)
-                    spacings_xy.append(np.min(spacings))
-            spacing_x, spacing_y = spacings_xy
-            # sets the limits before setting the value
-            self._set_kde_spacing(spacing_x=spacing_x,
-                                  spacing_y=spacing_y)
+
+        spacings_xy = []
+        for feat, scaleCombo in zip([axis_x, axis_y],
+                                    [self.comboBox_scale_x,
+                                     self.comboBox_scale_y]):
+            if feat is None:
+                spacings_xy.append(None)
+            else:
+                vmin, vmax = self.pipeline.get_min_max_coarse(
+                    feat=feat,
+                    plot_id=self.current_plot.identifier)
+
+                if scaleCombo.currentData() == "log":
+                    vmin = np.log(vmin)
+                    vmax = np.log(vmax)
+
+                spacings_xy.append((vmax-vmin)/300)
+
+        spacing_x, spacing_y = spacings_xy
+        # sets the limits before setting the value
+        self._set_kde_spacing(spacing_x=spacing_x,
+                              spacing_y=spacing_y)
 
     @property
     def current_plot(self):
@@ -432,14 +428,14 @@ class PlotPanel(QtWidgets.QWidget):
         gen = self.read_plot_state()["general"]
         if self.sender() == self.comboBox_axis_x:
             self._set_range_xy_state(axis_x=gen["axis x"])
-            self._set_kde_spacing_auto(axis_x=gen["axis x"])
+            self._set_kde_spacing_simple(axis_x=gen["axis x"])
         elif self.sender() == self.comboBox_axis_y:
             self._set_range_xy_state(axis_y=gen["axis y"])
-            self._set_kde_spacing_auto(axis_y=gen["axis y"])
+            self._set_kde_spacing_simple(axis_y=gen["axis y"])
         elif self.sender() == self.comboBox_scale_x:
-            self._set_kde_spacing_auto(axis_x=gen["axis x"])
+            self._set_kde_spacing_simple(axis_x=gen["axis x"])
         elif self.sender() == self.comboBox_scale_y:
-            self._set_kde_spacing_auto(axis_y=gen["axis y"])
+            self._set_kde_spacing_simple(axis_y=gen["axis y"])
 
     @QtCore.pyqtSlot()
     def on_column_num_changed(self):
@@ -500,21 +496,21 @@ class PlotPanel(QtWidgets.QWidget):
         with self.pipeline.lock:
             plot_id = self.current_plot.identifier
             new_id = self.pipeline.duplicate_plot(plot_id)
-            self.pp_mod_send.emit({"pipeline": {"plot_created": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"plot_created": new_id}})
 
     @QtCore.pyqtSlot()
     def on_plot_removed(self):
         with self.pipeline.lock:
             plot_id = self.current_plot.identifier
             self.pipeline.remove_plot(plot_id)
-            self.pp_mod_send.emit({"pipeline": {"plot_removed": plot_id}})
+        self.pp_mod_send.emit({"pipeline": {"plot_removed": plot_id}})
 
     @QtCore.pyqtSlot(dict)
     def on_pp_mod_recv(self, data):
         """We received a signal that something changed"""
-        pp_dict = data.get("pipeline")
-        if pp_dict:
-            if self.isVisible():
+        if self.isVisible():
+            pp_dict = data.get("pipeline", {})
+            if "plot_added" in pp_dict:
                 plot_id = pp_dict.get("plot_added")
                 if plot_id is not None:
                     plot_index = self.pipeline.plot_ids.index(plot_id)
@@ -522,6 +518,27 @@ class PlotPanel(QtWidgets.QWidget):
                     plot_index = None
                 self.update_content(plot_index)
 
+            pr_dict = data.get("pipeline-rendering", {})
+            if "plot_size_changed" in pr_dict:
+                plot_id = pr_dict.get("plot_size_changed")
+                plot_index = self.pipeline.plot_ids.index(plot_id)
+                state = self.pipeline.plots[plot_index].__getstate__()
+                self.spinBox_size_x.setValue(state["layout"]["size x"])
+                self.spinBox_size_y.setValue(state["layout"]["size y"])
+            elif "plot_range_corrected" in pr_dict:
+                plot_id = pr_dict.get("plot_range_corrected")
+                plot_index = self.pipeline.plot_ids.index(plot_id)
+                state = self.pipeline.plots[plot_index].__getstate__()
+                for nm, rc in [("range x", self.widget_range_x),
+                               ("range y", self.widget_range_y)]:
+                    rc.blockSignals(True)
+                    rc.write_pipeline_state({
+                        "active": True,
+                        "start": state["general"][nm][0],
+                        "end": state["general"][nm][1],
+                        })
+                    rc.blockSignals(False)
+
     @QtCore.pyqtSlot()
     @show_wait_cursor
     def on_spacing_auto(self):
@@ -639,4 +656,4 @@ class PlotPanel(QtWidgets.QWidget):
             plot_id = plot_state["identifier"]
             plot_index = self.pipeline.plot_ids.index(plot_id)
             self.pipeline.plots[plot_index].__setstate__(plot_state)
-            self.pp_mod_send.emit({"pipeline": {"plot_changed": plot_id}})
+        self.pp_mod_send.emit({"pipeline": {"plot_changed": plot_id}})

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/analysis/ana_plot.ui

@@ -301,7 +301,14 @@
           <item row="4" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout_8">
             <item>
-             <widget class="FeatureComboBox" name="comboBox_axis_y"/>
+             <widget class="FeatureComboBox" name="comboBox_axis_y">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
             </item>
             <item>
              <widget class="QComboBox" name="comboBox_scale_y">

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/analysis/ana_slot.py

@@ -345,7 +345,7 @@ class SlotPanel(QtWidgets.QWidget):
             new_id = self.pipeline.add_slot(path=slot_state["path"],
                                             index=pos + 1,
                                             )
-            self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
 
     @QtCore.pyqtSlot()
     def on_duplicate_slot(self):
@@ -353,7 +353,7 @@ class SlotPanel(QtWidgets.QWidget):
             # determine the new filter state
             slot_state = self.read_pipeline_state()
             new_id = self.pipeline.duplicate_slot(slot_state["identifier"])
-            self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
 
     @QtCore.pyqtSlot(dict)
     def on_pp_mod_recv(self, data):
@@ -368,7 +368,7 @@ class SlotPanel(QtWidgets.QWidget):
             slot_state = self.read_pipeline_state()
             slot_id = slot_state["identifier"]
             self.pipeline.remove_slot(slot_id)
-            self.pp_mod_send.emit({"pipeline": {"slot_created": slot_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_created": slot_id}})
 
     @QtCore.pyqtSlot()
     def on_reorder_slots(self):
@@ -505,4 +505,4 @@ class SlotPanel(QtWidgets.QWidget):
             slot_id = slot_state["identifier"]
             slot_index = self.pipeline.slot_ids.index(slot_id)
             self.pipeline.slots[slot_index].__setstate__(slot_state)
-            self.pp_mod_send.emit({"pipeline": {"slot_changed": slot_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_changed": slot_id}})

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/analysis/dlg_slot_reorder.py

@@ -36,8 +36,7 @@ class DlgSlotReorder(QtWidgets.QDialog):
         # reorder pipeline and send pipeline_changed signal
         with self.pipeline.lock:
             self.pipeline.reorder_slots(indices)
-            self.pp_mod_send.emit(
-                {"pipeline": {"slot_order_changed": indices}})
+        self.pp_mod_send.emit({"pipeline": {"slot_order_changed": indices}})
 
     @QtCore.pyqtSlot()
     def on_move_item(self):

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/bulk/bulk_emodulus.py

@@ -86,8 +86,7 @@ class BulkActionEmodulus(QtWidgets.QDialog):
     def on_ok(self):
         with self.pipeline.lock:
             self.set_emodulus_properties()
-            self.pp_mod_send.emit(
-                {"pipeline": {"feature_changed": "emodulus"}})
+        self.pp_mod_send.emit({"pipeline": {"feature_changed": "emodulus"}})
 
     @QtCore.pyqtSlot()
     def on_cb_medium(self):

dcscope-2.26.2/dcscope/gui/helpers.py

@@ -0,0 +1,34 @@
+def connect_pp_mod_signals(parent, child):
+    """The sender-receiver signal pyramid
+
+    Each widget that implements the `pp_mod_send` and `pp_mod_recv`
+    may be part of the sender-receiver pipeline modifications pyramid.
+    The tip of the pyramid is the main class.
+    When a widget changes something about the pipeline, it sends a dictionary
+    through the `pp_mod_send` signal up the pyramid. At the top of the
+    pyramid this signal is connected to the `pp_mod_recv` side of the
+    pyramid.
+    Every widget can send and receive any kind of pipeline change.
+    Receiving widgets are responsible for filtering out what they need.
+    This approach makes it easy to synchronize widgets.
+    """
+    parent.pp_mod_recv.connect(child.pp_mod_recv)
+    child.pp_mod_send.connect(parent.pp_mod_send)
+
+
+def disconnect_pp_mod_signals(parent, child):
+    """The sender-receiver signal pyramid
+
+    Each widget that implements the `pp_mod_send` and `pp_mod_recv`
+    may be part of the sender-receiver pipeline modifications pyramid.
+    The tip of the pyramid is the main class.
+    When a widget changes something about the pipeline, it sends a dictionary
+    through the `pp_mod_send` signal up the pyramid. At the top of the
+    pyramid this signal is connected to the `pp_mod_recv` side of the
+    pyramid.
+    Every widget can send and receive any kind of pipeline change.
+    Receiving widgets are responsible for filtering out what they need.
+    This approach makes it easy to synchronize widgets.
+    """
+    parent.pp_mod_recv.disconnect(child.pp_mod_recv)
+    child.pp_mod_send.disconnect(parent.pp_mod_send)

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/main.py

@@ -35,7 +35,7 @@ from . import (
     update,
     widgets,
 )
-from .helpers import connect_pp_mod_signals
+from .helpers import connect_pp_mod_signals, disconnect_pp_mod_signals
 
 # global plotting configuration parameters
 pg.setConfigOption("background", None)
@@ -57,7 +57,6 @@ logger = logging.getLogger(__name__)
 
 
 class DCscope(QtWidgets.QMainWindow):
-    plots_changed = QtCore.pyqtSignal()
     # widgets emit these whenever they changed the pipeline
     pp_mod_send = QtCore.pyqtSignal(dict)
     # widgets receive these so they can reflect the pipeline changes
@@ -134,7 +133,7 @@ class DCscope(QtWidgets.QMainWindow):
         store_keeper.set_interval(
             int(self.settings.value("cache/write interval", "30")))
         store_keeper.set_disk_store_size_bytes(int(float(
-            self.settings.value("cache/disk store size", "2")) * 1000**3))
+            self.settings.value("cache/disk store size", "9")) * 1000**3))
         store_keeper.set_memory_store_size(
             int(self.settings.value("cache/memory num", "200")))
 
@@ -384,7 +383,7 @@ class DCscope(QtWidgets.QMainWindow):
             pw = pipeline_plot.PipelinePlot(parent=sub,
                                             pipeline=self.pipeline,
                                             plot_id=plot_id)
-            self.plots_changed.connect(pw.update_content)
+            connect_pp_mod_signals(self, pw)
             sub.setWidget(pw)
             pw.update_content()
             self.mdiArea.addSubWindow(sub)
@@ -555,7 +554,7 @@ class DCscope(QtWidgets.QMainWindow):
         if yes:
             with self.pipeline.lock:
                 session.clear_session(self.pipeline)
-                self.pp_mod_send.emit({"pipeline": {"cleared": "full"}})
+            self.pp_mod_send.emit({"pipeline": {"cleared": "full"}})
             self.setWindowTitle(f"DCscope {version}")
         return yes
 
@@ -576,8 +575,7 @@ class DCscope(QtWidgets.QMainWindow):
                 slot_ids = list(self.pipeline.slot_ids)
                 for slot_id in slot_ids:
                     self.pipeline.remove_slot(slot_id)
-                self.pp_mod_send.emit(
-                    {"pipeline": {"slots_removed": slot_ids}})
+            self.pp_mod_send.emit({"pipeline": {"slots_removed": slot_ids}})
         return yes
 
     @QtCore.pyqtSlot()
@@ -694,8 +692,8 @@ class DCscope(QtWidgets.QMainWindow):
             settings.set_dir("filters", path, self.settings)
             with self.pipeline.lock:
                 session.import_filters(path, self.pipeline)
-                self.pp_mod_send.emit(
-                    {"pipeline": {"filters_imported": str(path)}})
+            self.pp_mod_send.emit(
+                {"pipeline": {"filters_imported": str(path)}})
 
     @QtCore.pyqtSlot()
     def on_action_open(self, path=None):
@@ -740,8 +738,7 @@ class DCscope(QtWidgets.QMainWindow):
                     else:
                         break
                 self.show()
-                self.pp_mod_send.emit(
-                    {"pipeline": {"session_opened": str(path)}})
+            self.pp_mod_send.emit({"pipeline": {"session_opened": str(path)}})
             self.setWindowTitle(
                 f"{pathlib.Path(path).name} [DCscope {version}]")
 
@@ -921,7 +918,7 @@ class DCscope(QtWidgets.QMainWindow):
                     for child in sub.children():
                         # disconnect signals
                         if isinstance(child, pipeline_plot.PipelinePlot):
-                            self.plots_changed.disconnect(child.update_content)
+                            disconnect_pp_mod_signals(self, child)
                             break
                     sub.deleteLater()
 
@@ -945,11 +942,6 @@ class DCscope(QtWidgets.QMainWindow):
         QtWidgets.QApplication.processEvents(
             QtCore.QEventLoop.ProcessEventsFlag.AllEvents, 300)
 
-        if data.get("pipeline"):
-            # Update plots after updating block matrix
-            with widgets.ShowWaitCursor():
-                self.plots_changed.emit()
-
         # redraw
         self.mdiArea.update()
         self.subwindows["analysis_view"].update()

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/matrix/dm_dataset.py

@@ -80,20 +80,20 @@ class MatrixDataset(QtWidgets.QWidget):
         with self.pipeline.lock:
             slot_id = self.pipeline.slot_ids[self.slot_index]
             new_id = self.pipeline.duplicate_slot(slot_id)
-            self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
 
     def action_insert_anew(self):
         with self.pipeline.lock:
             new_id = self.pipeline.add_slot(
                 path=self.path,
                 index=self.slot_index+1)
-            self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_created": new_id}})
 
     def action_remove(self):
         with self.pipeline.lock:
             slot_id = self.pipeline.slot_ids[self.slot_index]
             self.pipeline.remove_slot(slot_id)
-            self.pp_mod_send.emit({"pipeline": {"slot_removed": slot_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_removed": slot_id}})
 
     @QtCore.pyqtSlot()
     def on_active_toggled(self):
@@ -115,13 +115,13 @@ class MatrixDataset(QtWidgets.QWidget):
                     active=self.active
                 )
 
-            self.pp_mod_send.emit({"pipeline": {"slot_toggled": slot_id}})
+        self.pp_mod_send.emit({"pipeline": {"slot_toggled": slot_id}})
 
     def on_enabled_toggled(self, b):
         with self.pipeline.lock:
             self.pipeline.slots[self.slot_index].slot_used = b
             state = "enabled" if b else "disabled"
-            self.pp_mod_send.emit({"pipeline": {f"slot {state}": b}})
+        self.pp_mod_send.emit({"pipeline": {f"slot {state}": b}})
 
     def on_modify(self):
         self.modify_clicked.emit(self.identifier)

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/matrix/dm_dataset.ui

@@ -32,6 +32,9 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <property name="sizeConstraint">
+    <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
+   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -150,6 +153,36 @@
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QToolButton" name="toolButton_modify">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>9</pointsize>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>Modify this dataset in Analysis View</string>
+        </property>
+        <property name="text">
+         <string>edit</string>
+        </property>
+        <property name="icon">
+         <iconset theme="tools-wizard"/>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="Line" name="line">
         <property name="styleSheet">
@@ -166,52 +199,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item alignment="Qt::AlignmentFlag::AlignLeft">
-         <widget class="QToolButton" name="toolButton_modify">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>9</pointsize>
-           </font>
-          </property>
-          <property name="toolTip">
-           <string>Modify this dataset in Analysis View</string>
-          </property>
-          <property name="text">
-           <string>edit</string>
-          </property>
-          <property name="icon">
-           <iconset theme="tools-wizard"/>
-          </property>
-          <property name="toolButtonStyle">
-           <enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
-          </property>
-          <property name="autoRaise">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="spacing">

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/matrix/dm_element.py

@@ -51,8 +51,8 @@ class DataMatrixElement(QtWidgets.QWidget):
                     self.pipeline.set_element_active(slot_id,
                                                      filter_id,
                                                      not self.active)
-                    self.pp_mod_send.emit(
-                        {"pipeline": {"filter_ray_change": slot_id}})
+                self.pp_mod_send.emit(
+                    {"pipeline": {"filter_ray_change": slot_id}})
 
             event.accept()
 

{dcscope-2.26.1 → dcscope-2.26.2}/dcscope/gui/matrix/dm_filter.py

@@ -31,6 +31,11 @@ class MatrixFilter(QtWidgets.QWidget):
         menu.addAction('remove', self.action_remove)
         self.toolButton_opt.setMenu(menu)
 
+        self.setFixedWidth(int(65))
+        self.setMinimumWidth(int(65))
+        self.setMaximumWidth(int(65))
+        self.adjustSize()
+
         # toggle all active, all inactive, semi state
         self.toolButton_toggle.clicked.connect(self.on_active_toggled)
 
@@ -81,7 +86,7 @@ class MatrixFilter(QtWidgets.QWidget):
                     filt_plot_id=filter_id,
                     active=self.active
                 )
-            self.pp_mod_send.emit({"pipeline": {"filter_toggled": filter_id}})
+        self.pp_mod_send.emit({"pipeline": {"filter_toggled": filter_id}})
 
     @QtCore.pyqtSlot(dict)
     def on_pp_mod_recv(self, data: dict):
@@ -116,19 +121,19 @@ class MatrixFilter(QtWidgets.QWidget):
         with self.pipeline.lock:
             filt_id = self.pipeline.filter_ids[self.filt_index]
             new_id = self.pipeline.duplicate_filter(filt_id)
-            self.pp_mod_send.emit({"pipeline": {"filter_added": new_id}})
+        self.pp_mod_send.emit({"pipeline": {"filter_added": new_id}})
 
     def action_remove(self):
         with self.pipeline.lock:
             filter_id = self.pipeline.filter_ids[self.filt_index]
             self.pipeline.remove_filter(filter_id)
-            self.pp_mod_send.emit({"pipeline": {"filter_removed": filter_id}})
+        self.pp_mod_send.emit({"pipeline": {"filter_removed": filter_id}})
 
     def on_enabled_toggled(self, b):
         with self.pipeline.lock:
             self.pipeline.filters[self.filt_index].filter_used = b
             state = "enabled" if b else "disabled"
-            self.pp_mod_send.emit({"pipeline": {f"filter {state}": b}})
+        self.pp_mod_send.emit({"pipeline": {f"filter {state}": b}})
 
     def on_modify(self):
         self.modify_clicked.emit(self.identifier)