fix: ValueError wehn filtering all events in Quick View (close #37)

Author: paulmueller

CHANGELOG

@@ -1,5 +1,6 @@
 2.0.2
  - fix: IndexError when removing a plot (#36)
+ - fix: ValueError wehn filtering all events in Quick View (#37)
 2.0.1
  - fix: correctly distinguish prereleases when checking for new versions
  - enh: allow loading data via drag&drop

shapeout2/gui/matrix/block_matrix.py

@@ -117,7 +117,7 @@ def get_widget(self, slot_id=None, filt_plot_id=None):
             return wi
         else:
             raise ValueError(
-                "One of `slot_id` or `filt_plot_id` must be specified!")
+                "At least one of `slot_id`, `filt_plot_id` must be specified!")
 
     def invalidate_elements(self, invalid_dm, invalid_pm):
         for slot_id, filt_id in invalid_dm:

shapeout2/gui/matrix/data_matrix.py

@@ -360,6 +360,9 @@ def get_quickview_ids(self):
                     me = self.get_matrix_element(slot_id, filt_id)
                     if current == me:
                         return slot_id, filt_id
+            else:
+                # no valid QuickView selection (issue #38)
+                return None, None
         else:
             return None, None
 

shapeout2/gui/quick_view/qv_scatter.py

@@ -105,13 +105,14 @@ def plot_data(self, rtdc_ds, slot, xax="area_um", yax="deform",
         cmap = pg.ColorMap(*zip(*Gradients["viridis"]["ticks"]))
         for k in kde:
             brush.append(cmap.mapToQColor(k))
-        # set viewbox
-        pipeline_plot.set_viewbox(plot=self,
-                                  range_x=(x.min(), x.max()),
-                                  range_y=(y.min(), y.max()),
-                                  scale_x=self.xscale,
-                                  scale_y=self.yscale,
-                                  padding=0.05)
+        if x.size:  # test for empty x/y (#37)
+            # set viewbox
+            pipeline_plot.set_viewbox(plot=self,
+                                      range_x=(x.min(), x.max()),
+                                      range_y=(y.min(), y.max()),
+                                      scale_x=self.xscale,
+                                      scale_y=self.yscale,
+                                      padding=0.05)
         # set data
         self.setData(x, y, brush=brush)
         # set axes labels (replace with user-defined flourescence names)

tests/test_gui_quickview.py

@@ -1,4 +1,4 @@
-"""Test of data set functionalities"""
+"""Test of Quick View set functionalities"""
 import pathlib
 
 from PyQt5 import QtCore
@@ -51,23 +51,30 @@ def test_clear_session_issue_25(qtbot):
 
 
 def test_update_polygon_filter_issue_26(qtbot):
-    """https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/26"""
+    """https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/26
+
+    The recomputation of the filter ray was not triggered for some
+    reason.
+    """
     mw = ShapeOut2()
     qtbot.addWidget(mw)
 
     # add a dataslot
     path = pathlib.Path(__file__).parent / "data" / "calibration_beads_47.rtdc"
-    mw.add_dataslot(paths=[path])
+    filt_id = mw.add_filter()
+    slot_ids = mw.add_dataslot(paths=[path])
 
     assert len(mw.pipeline.slot_ids) == 1, "we added that"
     assert len(mw.pipeline.filter_ids) == 1, "automatically added"
 
     # activate a dataslot
-    slot_id = mw.pipeline.slot_ids[0]
-    filt_id = mw.pipeline.filter_ids[0]
+    slot_id = slot_ids[0]
     em = mw.block_matrix.get_widget(slot_id, filt_id)
-    qtbot.mouseClick(em, QtCore.Qt.LeftButton)  # activate
     qtbot.mouseClick(em, QtCore.Qt.LeftButton, QtCore.Qt.ShiftModifier)
+
+    em = mw.block_matrix.get_widget(slot_id, filt_id)
+    qtbot.mouseClick(em, QtCore.Qt.LeftButton)
+
     # did that work?
     assert mw.toolButton_quick_view.isChecked()
 

tests/test_gui_quickview2.py

@@ -0,0 +1,78 @@
+"""Test of Quick View functionalities
+
+Created a new test file because putting "test_no_events_issue_37" and
+"test_update_polygon_filter_issue_26" in one file raised an error
+"RuntimeError: wrapped C/C++ object of type MatrixElement has been
+deleted" (similar to issue #38).
+"""
+import pathlib
+
+from PyQt5 import QtCore
+
+import numpy as np
+from shapeout2.gui.main import ShapeOut2
+from shapeout2 import session
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def run_around_tests():
+    # Code that will run before your test, for example:
+    session.clear_session()
+    # A test function will be run at this point
+    yield
+    # Code that will run after your test, for example:
+    session.clear_session()
+
+
+def test_no_events_issue_37(qtbot):
+    """https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/37
+
+    "ValueError: zero-size array to reduction operation minimum
+    which has no identity" when all events are filtered out.
+    """
+    mw = ShapeOut2()
+    qtbot.addWidget(mw)
+
+    # add a dataslot
+    path = pathlib.Path(__file__).parent / "data" / "calibration_beads_47.rtdc"
+    mw.add_dataslot(paths=[path, path])
+
+    assert len(mw.pipeline.slot_ids) == 2, "we added those"
+    assert len(mw.pipeline.filter_ids) == 1, "automatically added"
+
+    # activate a dataslot
+    slot_id = mw.pipeline.slot_ids[0]
+    filt_id = mw.pipeline.filter_ids[0]
+    em = mw.block_matrix.get_widget(slot_id, filt_id)
+    qtbot.mouseClick(em, QtCore.Qt.LeftButton)  # activate
+    # did that work?
+    assert mw.pipeline.is_element_active(slot_id, filt_id)
+
+    # filter away all events
+    fe = mw.block_matrix.get_widget(filt_plot_id=filt_id)
+    qtbot.mouseClick(fe.toolButton_modify, QtCore.Qt.LeftButton)
+    fv = mw.widget_ana_view.widget_filter
+    qtbot.mouseClick(fv.toolButton_moreless, QtCore.Qt.LeftButton)
+    rc = fv._box_range_controls["area_um"]
+    qtbot.mouseClick(rc.checkBox, QtCore.Qt.LeftButton)
+    # did that work?
+    assert rc.checkBox.isChecked()
+    qtbot.mouseClick(fv.toolButton_moreless, QtCore.Qt.LeftButton)
+    # set range
+    rc.doubleSpinBox_min.setValue(0)
+    rc.doubleSpinBox_max.setValue(1)
+    qtbot.mouseClick(fv.pushButton_apply, QtCore.Qt.LeftButton)
+    # did that work?
+    ds = mw.pipeline.get_dataset(slot_index=0, filt_index=0,
+                                 apply_filter=True)
+    assert np.sum(ds.filter.all) == 0
+
+    # open QuickView
+    slot_id = mw.pipeline.slot_ids[0]
+    filt_id = mw.pipeline.filter_ids[0]
+    em = mw.block_matrix.get_widget(slot_id, filt_id)
+
+    # this raised the error
+    qtbot.mouseClick(em, QtCore.Qt.LeftButton, QtCore.Qt.ShiftModifier)
+    mw.close()