Changeset 10707


Ignore:
Timestamp:
04/02/14 14:13:44 (5 years ago)
Author:
psteiner
Message:

FilterView

Location:
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ComparisonFilterView.cs

    r10693 r10707  
    140140        }
    141141      }
    142       this.Content.ConstraintData = new StringValue();
     142      //this.Content.ConstraintData = new StringValue();
    143143    }
    144144
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

    r10703 r10707  
    1212using HeuristicLab.DataPreprocessing.Filter;
    1313using HeuristicLab.Collections;
     14using HeuristicLab.Data;
    1415
    1516namespace HeuristicLab.DataPreprocessing.Views
     
    3940    {
    4041      get { return (FilterContent)base.Content; }
    41       set { base.Content = value; tbTotal.Text = Content.FilterLogic.PreprocessingData.Rows.ToString(); }
     42      set { base.Content = value;}
    4243    }
    4344
     
    4748      foreach (IFilter filter in e.Items)
    4849      {
    49         if (!filter.Active && (filter.ConstrainedValue == null || filter.ConstraintData == null  || filter.ConstraintOperation == null))
     50        if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value)) )
    5051        {
    51           filterView.Content.SetItemCheckedState(filter, false);
     52          filter.ConstraintData = new StringValue("0");
    5253        }
    53         else //change active state of filters
    54         {
    55           filter.Active = !filter.Active;
    56         }
     54        filter.Active = !filter.Active;
    5755      }
    5856      UpdateFilterInfo();
Note: See TracChangeset for help on using the changeset viewer.