Changeset 10707 for branches/DataPreprocessing

Timestamp:

04/02/14 14:13:44 (11 years ago)

Author:

psteiner

Message:

FilterView

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• ComparisonFilterView.cs (modified) (1 diff)
• FilterView.cs (modified) (3 diffs)

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

@@ -140 +140 @@
         }
       }
-      this.Content.ConstraintData = new StringValue();
+      //this.Content.ConstraintData = new StringValue();
     }
 

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

@@ -12 +12 @@
 using HeuristicLab.DataPreprocessing.Filter;
 using HeuristicLab.Collections;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing.Views
@@ -39 +40 @@
     {
       get { return (FilterContent)base.Content; }
-      set { base.Content = value; tbTotal.Text = Content.FilterLogic.PreprocessingData.Rows.ToString(); }
+      set { base.Content = value;}
     }
 
@@ -47 +48 @@
       foreach (IFilter filter in e.Items)
       {
-        if (!filter.Active && (filter.ConstrainedValue == null || filter.ConstraintData == null  || filter.ConstraintOperation == null))
+        if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value)) )
         {
-          filterView.Content.SetItemCheckedState(filter, false);
+          filter.ConstraintData = new StringValue("0");
         }
-        else //change active state of filters
-        {
-          filter.Active = !filter.Active;
-        }
+        filter.Active = !filter.Active;
       }
       UpdateFilterInfo();