reg: filters not applied in final plots since 2.25.1

Author: paulmueller

CHANGELOG

@@ -1,4 +1,5 @@
 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: increase default disk store size from 2GB to 9GB

dcscope/pipeline/filter_ray.py

@@ -101,6 +101,14 @@ def get_final_child(self, rtdc_ds=None, filters=None, apply_filter=True):
         # past self
 
         filters = [f for f in filters if f.filter_used]
+        if self.segments:
+            # Make sure that the segments are trimmed to the amount of
+            # filters in the filter ray.
+            self.segments = self.segments[:len(filters)]
+            if self.segments:
+                # Make sure that the final dataset in the segments does not
+                # have any filters applied.
+                self.segments[-1][2].reset_filter()
 
         if filters:
             # apply all filters
@@ -126,11 +134,11 @@ def get_final_child(self, rtdc_ds=None, filters=None, apply_filter=True):
             final_ds = ds
         else:
             final_ds = ds
-
-        if not external_ds:
+            # make sure no filters are applied to the returned dataset
             ds.reset_filter()
 
         if apply_filter:
+            # Apply all filters in the underlying hierarchy.
             final_ds.apply_filter()
 
         return final_ds

tests/test_pipeline_filter_ray_2.py

@@ -0,0 +1,114 @@
+import pathlib
+
+from dcscope import pipeline
+
+
+def test_filtering_change_get_dataset():
+    path = pathlib.Path(__file__).parent / "data" / "calibration_beads_47.rtdc"
+
+    # initialize
+    slot = pipeline.Dataslot(path)
+    ds = slot.get_dataset()
+    assert len(ds) == 47
+    ray = pipeline.FilterRay(slot)
+
+    filt1 = pipeline.Filter()
+    filt1.limit_events = [True, 4]
+
+    ray.set_filters([filt1])
+    ds1 = ray.get_dataset()
+    assert len(ds1) == 4
+
+    filt1.limit_events = [False, 4]
+    ds2 = ray.get_dataset()
+    assert len(ds2) == 47
+
+    filt1.limit_events = [True, 4]
+    ds3 = ray.get_dataset()
+    assert len(ds3) == 4
+
+    filt1.limit_events = [False, 4]
+    ds4 = ray.get_dataset()
+    assert len(ds4) == 47
+
+
+def test_filtering_change_get_final_child():
+    path = pathlib.Path(__file__).parent / "data" / "calibration_beads_47.rtdc"
+
+    # initialize
+    slot = pipeline.Dataslot(path)
+    ds = slot.get_dataset()
+    assert len(ds) == 47
+    ray = pipeline.FilterRay(slot)
+
+    filt1 = pipeline.Filter()
+    filt1.limit_events = [True, 4]
+
+    ray.set_filters([filt1])
+    ds1 = ray.get_final_child()
+    assert len(ds1) == 4
+
+    filt1.limit_events = [False, 4]
+    ds2 = ray.get_final_child()
+    assert len(ds2) == 47
+
+    filt1.limit_events = [True, 4]
+    ds3 = ray.get_final_child()
+    assert len(ds3) == 4
+
+    filt1.limit_events = [False, 4]
+    ds4 = ray.get_final_child()
+    assert len(ds4) == 47
+
+
+def test_filtering_change_with_pipeline():
+    path = pathlib.Path(__file__).parent / "data" / "calibration_beads_47.rtdc"
+
+    # initialize
+    pipe = pipeline.Pipeline()
+    pipe.add_slot(path=path)
+    filt1 = pipeline.Filter()
+    pipe.add_filter(filt1)
+    ds = pipe.get_dataset(0)
+    assert len(ds) == 47
+
+    slot_id = pipe.slot_ids[0]
+    filt_id = filt1.identifier
+
+    pipe.set_element_active(slot_id, filt_id, True)
+
+    assert pipe.filter_ids == [filt_id]
+    filters = pipe.get_filters_for_slot(slot_id=slot_id,
+                                        max_filter_index=-1)
+    assert filters[0] == filt1
+
+    filt1.limit_events = [True, 4]
+
+    assert pipe.element_states[slot_id][filt_id]
+    assert pipe.get_filters_for_slot(slot_id=slot_id,
+                                     max_filter_index=-1) == [filt1]
+    ds1 = pipe.get_dataset(0)
+    assert len(ds1) == 4
+
+    pipe.set_element_active(slot_id, filt_id, False)
+    assert not pipe.element_states[slot_id][filt_id]
+    assert pipe.get_filters_for_slot(slot_id=slot_id,
+                                     max_filter_index=-1) == []
+    ds2 = pipe.get_dataset(0)
+    assert len(ds2) == 47
+
+    pipe.set_element_active(slot_id, filt_id, True)
+    assert pipe.element_states[slot_id][filt_id]
+    assert len(pipe.filters) == 1
+    assert pipe.get_filters_for_slot(slot_id=slot_id,
+                                     max_filter_index=-1) == [filt1]
+    ray = pipe.get_ray(slot_id)
+    ray.set_filters([filt1])
+    ds3a = ray.get_dataset()
+    assert len(ds3a) == 4
+    ds3b = pipe.get_dataset(0)
+    assert len(ds3b) == 4
+
+    pipe.set_element_active(slot_id, filt_id, False)
+    ds4 = pipe.get_dataset(0)
+    assert len(ds4) == 47