Changeset 10900 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilteredPreprocessingData.cs

Timestamp:

05/28/14 12:52:24 (10 years ago)

Author:

sbreuer

Message:

• deleted unused method
• refactored filter logic
• added filter changed event
• changed datagridview validation (cannot modify, if filter is active)
• update datagridview if preview is active

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilteredPreprocessingData.cs (modified) (3 diffs)

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

@@ -118 +118 @@
         }
       }
+
+      OnFilterChanged();
     }
 
     public void PersistFilter() {
-      originalData = (ITransactionalPreprocessingData)filteredData.Clone();
+      originalData.InTransaction(() => {
+        for (int i = 0; i < filteredData.Columns; ++i) {
+          if (filteredData.IsType<double>(i)) {
+            originalData.SetValues<double>(i, filteredData.GetValues<double>(i));
+          } else if (filteredData.IsType<string>(i)) {
+            originalData.SetValues<string>(i, filteredData.GetValues<string>(i));
+          } else if (filteredData.IsType<DateTime>(i)) {
+            originalData.SetValues<DateTime>(i, filteredData.GetValues<DateTime>(i));
+          } else {
+            throw new ArgumentException("Data types of columns do not match");
+          }
+        }
+      });
       ResetFilter();
     }
@@ -127 +141 @@
     public void ResetFilter() {
       filteredData = null;
+      OnFilterChanged();
+    }
+
+    private void OnFilterChanged() {
+      if (FilterChanged != null) {
+        FilterChanged(this, new EventArgs());
+      }
     }
 
@@ -171 +192 @@
     }
 
+    public event EventHandler FilterChanged;
+
     #region IPreprocessingData Members