Changeset 10939 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4

Timestamp:

06/04/14 13:09:51 (10 years ago)

Author:

sbreuer

Message:

• do filtering in transaction, so the content changed event is only fired once
• fix bug with apply filter

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations

Files:

• FilterLogic.cs (modified) (1 diff)
• FilteredPreprocessingData.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/FilterLogic.cs

@@ -74 +74 @@
 
     public void Apply(IList<IFilter> filters, bool isAndCombination) {
-      preprocessingData.SetFilter(Preview(filters, isAndCombination));
       preprocessingData.PersistFilter();
+      Reset();
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs

@@ -110 +110 @@
 
     public void SetFilter(bool[] rowFilters) {
-
       filteredData = (ITransactionalPreprocessingData)originalData.Clone();
-
-      for (int row = (rowFilters.Length - 1); row >= 0; --row) {
-        if (rowFilters[row]) {
-          filteredData.DeleteRow(row);
+      filteredData.InTransaction(() => {
+        for (int row = (rowFilters.Length - 1); row >= 0; --row) {
+          if (rowFilters[row]) {
+            filteredData.DeleteRow(row);
+          }
         }
-      }
-
+      });
       OnFilterChanged();
     }