Changeset 10813

Timestamp:

05/07/14 13:24:56 (11 years ago)

Author:

psteiner

Message:

BugFix within the logical conjunction of filters
persistence of filters in content

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/CheckedFilterCollectionView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs (modified) (7 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/FilterContent.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/CheckedFilterCollectionView.cs

@@ -27 +27 @@
     protected override void addButton_Click(object sender, EventArgs e)
     {
-      Content.Add(new ComparisonFilter());
+      IFilter filter = new ComparisonFilter();
+      Content.Add(filter);
+      Content.SetItemCheckedState(filter, false);
     }
+
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

@@ -14 +14 @@
   [Content(typeof(FilterContent), true)]
   public partial class FilterView : ItemView {
-    //private CheckedItemCollectionView<IFilter> filterView;
 
     public FilterView() {
@@ -22 +21 @@
       tbPercentage.Text = "0%";
       checkedFilterView.Content = new CheckedItemCollection<IFilter>();
-      //filterView = new CheckedItemCollectionView<IFilter>();
-      //filterView = new CheckedFilterCollectionView();
-      /*filterView.Dock = DockStyle.Fill;
-      filterView.Content = new CheckedItemCollection<IFilter>();
-       * */
       checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
       checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
       checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
-      //groupBoxFilter.Controls.Add(filterView);*/
     }
 
     public new FilterContent Content {
       get { return (FilterContent)base.Content; }
-      set { base.Content = value; UpdateFilterInfo(); }
+      set { base.Content = value; }
+    }
+
+    protected override void OnContentChanged()
+    {
+      base.OnContentChanged();
+      if (Content != null)
+      {
+        ImportFiltersFromContent();
+        UpdateFilterInfo();
+      }
     }
 
@@ -42 +45 @@
       foreach (IFilter filter in e.Items)
       {
-        filter.Active = !filter.Active;
+        filter.Active = checkedFilterView.Content.ItemChecked(filter);
       }
       UpdateFilterInfo();
+      ExportFiltersToContent();
       Refresh();
       ResumeRepaint(true);
@@ -64 +68 @@
   
       tbFiltered.Text = filteredCnt.ToString();
-      double percentage = filteredCnt * 100 / result.Length;
+      double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / result.Length;
       tbPercentage.Text = percentage.ToString() + "%";
       tbTotal.Text = result.Length.ToString();
@@ -78 +82 @@
       foreach (IFilter filter in e.Items) {
         filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
-        filter.Active = true;
-        checkedFilterView.Content.SetItemCheckedState(filter, false);
       }
       UpdateFilterInfo();
+      ExportFiltersToContent();
     }
 
     private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IFilter> e) {
       UpdateFilterInfo();
+      ExportFiltersToContent();
     }
 
@@ -91 +95 @@
     {
       UpdateFilterInfo();
+      ExportFiltersToContent();
     }
 
@@ -98 +103 @@
     }
 
+    private void ImportFiltersFromContent()
+    {
+      checkedFilterView.ItemCollection.AddRange(Content.Filters);
+
+      foreach (IFilter filter in checkedFilterView.ItemCollection) {
+        if (filter.Active)
+        {
+          checkedFilterView.Content.SetItemCheckedState(filter, true);
+        }
+        else
+        {
+          checkedFilterView.Content.SetItemCheckedState(filter, false);
+        }
+
+      }
+    }
+
+    private void ExportFiltersToContent()
+    {
+      Content.Filters = checkedFilterView.ItemCollection.ToList<IFilter>();
+    }
   }
 }

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using System.Collections.Generic;
+using HeuristicLab.DataPreprocessing.Filter;
 
 namespace HeuristicLab.DataPreprocessing {
   [Item("Filter", "Represents the filter grid.")]
   public class FilterContent : Item, IViewShortcut {
+
+    private IList<IFilter> filters = new List<IFilter>();
 
     public static new Image StaticItemImage {
@@ -43 +47 @@
     }
 
+    public IList<IFilter> Filters
+    {
+      get
+      {
+        return this.filters;
+      }
+      set
+      {
+        this.filters = value;
+      }
+    }
+
     public FilterContent(FilterContent content, Cloner cloner)
       : base(content, cloner) {
@@ -52 +68 @@
     }
 
+
+
   }
 }