Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10713


Ignore:
Timestamp:
04/02/14 15:43:14 (10 years ago)
Author:
psteiner
Message:

FilterView + Design

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

Legend:

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

    r10707 r10713  
    140140        }
    141141      }
    142       //this.Content.ConstraintData = new StringValue();
     142      if (Content.ConstraintData == null)
     143        this.Content.ConstraintData = new StringValue();
    143144    }
    144145
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.Designer.cs

    r10696 r10713  
    104104      this.lblFiltered.Location = new System.Drawing.Point(15, 47);
    105105      this.lblFiltered.Name = "lblFiltered";
    106       this.lblFiltered.Size = new System.Drawing.Size(41, 13);
     106      this.lblFiltered.Size = new System.Drawing.Size(44, 13);
    107107      this.lblFiltered.TabIndex = 8;
    108       this.lblFiltered.Text = "Filtered";
     108      this.lblFiltered.Text = "Filtered:";
    109109      //
    110110      // tbTotal
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

    r10712 r10713  
    3636
    3737    private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
    38 
    39       foreach (IFilter filter in e.Items) {
    40         if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value))) {
     38     
     39      foreach (IFilter filter in e.Items)
     40      {
     41 /*       if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value)) )
     42        {
    4143          filter.ConstraintData = new StringValue("0");
    4244        }
     45  * */
    4346        filter.Active = !filter.Active;
    4447      }
     
    5659
    5760      bool[] result = Content.FilterLogic.Preview(filters);
    58 
     61     
    5962      int filteredCnt = result.Count(c => !c);
    60 
     63 
    6164      tbFiltered.Text = filteredCnt.ToString();
    6265      double percentage = filteredCnt * 100 / result.Length;
Note: See TracChangeset for help on using the changeset viewer.