Changeset 10785 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

Timestamp:

04/23/14 15:51:41 (10 years ago)

Author:

psteiner

Message:

filter or combination
filter control: checkedlistview

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs (modified) (7 diffs)

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

@@ -14 +14 @@
   [Content(typeof(FilterContent), true)]
   public partial class FilterView : ItemView {
-    private CheckedItemCollectionView<IFilter> filterView;
+    //private CheckedItemCollectionView<IFilter> filterView;
 
     public FilterView() {
@@ -21 +21 @@
       tbFiltered.Text = "0";
       tbPercentage.Text = "0%";
-      filterView = new CheckedItemCollectionView<IFilter>();
-      filterView.Dock = DockStyle.Fill;
+      checkedFilterView.Content = new CheckedItemCollection<IFilter>();
+      //filterView = new CheckedItemCollectionView<IFilter>();
+      //filterView = new CheckedFilterCollectionView();
+      /*filterView.Dock = DockStyle.Fill;
       filterView.Content = new CheckedItemCollection<IFilter>();
-      filterView.Content.ItemsAdded += Content_ItemsAdded;
-      filterView.Content.ItemsRemoved += Content_ItemsRemoved;
-      filterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
-      groupBoxFilter.Controls.Add(filterView);
+       * */
+      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; }
+      set { base.Content = value; UpdateFilterInfo(); }
     }
 
@@ -39 +42 @@
       foreach (IFilter filter in e.Items)
       {
- /*       if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value)) )
-        {
-          filter.ConstraintData = new StringValue("0");
-        }
-  * */
         filter.Active = !filter.Active;
       }
@@ -52 +50 @@
 
     private void UpdateFilterInfo() {
-      List<IFilter> filters = filterView.ItemCollection.ToList<IFilter>();
+      List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
 
       int activeFilters = filters.Count(c => c.Active);
 
       applyFilterButton.Enabled = (activeFilters > 0);
+      rBtnAnd.Enabled = (activeFilters > 0);
+      rBtnOr.Enabled = (activeFilters > 0);
+      btnReset.Enabled = (activeFilters > 0);
 
-      bool[] result = Content.FilterLogic.Preview(filters);
+      bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
       
-      int filteredCnt = result.Count(c => !c);
+      int filteredCnt = result.Count(c => c);
   
       tbFiltered.Text = filteredCnt.ToString();
@@ -69 +70 @@
 
     private void applyFilterButton_Click(object sender, EventArgs e) {
-      List<IFilter> filters = filterView.ItemCollection.ToList<IFilter>();
-      Content.FilterLogic.Apply(filters);
+      List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
+      Content.FilterLogic.Apply(filters, rBtnAnd.Checked);
     }
 
@@ -78 +79 @@
         filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
         filter.Active = true;
-        filterView.Content.SetItemCheckedState(filter, false);
+        checkedFilterView.Content.SetItemCheckedState(filter, false);
       }
       UpdateFilterInfo();
@@ -87 +88 @@
     }
 
+    private void rBtnAnd_CheckedChanged(object sender, EventArgs e)
+    {
+      UpdateFilterInfo();
+    }
+
+    private void btnReset_Click(object sender, EventArgs e)
+    {
+      Content.FilterLogic.Reset();
+    }
+
   }
 }