Changeset 10713 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views

Timestamp:

04/02/14 15:43:14 (11 years ago)

Author:

psteiner

Message:

FilterView + Design

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• ComparisonFilterView.cs (modified) (1 diff)
• FilterView.Designer.cs (modified) (1 diff)
• FilterView.cs (modified) (2 diffs)

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

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

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

@@ -104 +104 @@
       this.lblFiltered.Location = new System.Drawing.Point(15, 47);
       this.lblFiltered.Name = "lblFiltered";
-      this.lblFiltered.Size = new System.Drawing.Size(41, 13);
+      this.lblFiltered.Size = new System.Drawing.Size(44, 13);
       this.lblFiltered.TabIndex = 8;
-      this.lblFiltered.Text = "Filtered";
+      this.lblFiltered.Text = "Filtered:";
       // 
       // tbTotal

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

@@ -36 +36 @@
 
     private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
-
-      foreach (IFilter filter in e.Items) {
-        if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value))) {
+      
+      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;
       }
@@ -56 +59 @@
 
       bool[] result = Content.FilterLogic.Preview(filters);
-
+      
       int filteredCnt = result.Count(c => !c);
-
+  
       tbFiltered.Text = filteredCnt.ToString();
       double percentage = filteredCnt * 100 / result.Length;