Changeset 11044


Ignore:
Timestamp:
06/25/14 13:16:53 (5 years ago)
Author:
sbreuer
Message:

show remaining values in filter preview

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

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.Designer.cs

    r10979 r11044  
    3434      this.lblPercentage = new System.Windows.Forms.Label();
    3535      this.tbPercentage = new System.Windows.Forms.TextBox();
    36       this.tbFiltered = new System.Windows.Forms.TextBox();
    37       this.lblFiltered = new System.Windows.Forms.Label();
     36      this.tbRemaining = new System.Windows.Forms.TextBox();
     37      this.lblRemaining = new System.Windows.Forms.Label();
    3838      this.tbTotal = new System.Windows.Forms.TextBox();
    3939      this.lblTotal = new System.Windows.Forms.Label();
     
    8181      this.groupBoxFilterInfo.Controls.Add(this.lblPercentage);
    8282      this.groupBoxFilterInfo.Controls.Add(this.tbPercentage);
    83       this.groupBoxFilterInfo.Controls.Add(this.tbFiltered);
    84       this.groupBoxFilterInfo.Controls.Add(this.lblFiltered);
     83      this.groupBoxFilterInfo.Controls.Add(this.tbRemaining);
     84      this.groupBoxFilterInfo.Controls.Add(this.lblRemaining);
    8585      this.groupBoxFilterInfo.Controls.Add(this.tbTotal);
    8686      this.groupBoxFilterInfo.Controls.Add(this.lblTotal);
     
    113113      // tbFiltered
    114114      //
    115       this.tbFiltered.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    116             | System.Windows.Forms.AnchorStyles.Right)));
    117       this.tbFiltered.Enabled = false;
    118       this.tbFiltered.Location = new System.Drawing.Point(104, 45);
    119       this.tbFiltered.Name = "tbFiltered";
    120       this.tbFiltered.Size = new System.Drawing.Size(549, 20);
    121       this.tbFiltered.TabIndex = 9;
     115      this.tbRemaining.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     116            | System.Windows.Forms.AnchorStyles.Right)));
     117      this.tbRemaining.Enabled = false;
     118      this.tbRemaining.Location = new System.Drawing.Point(104, 45);
     119      this.tbRemaining.Name = "tbRemaining";
     120      this.tbRemaining.Size = new System.Drawing.Size(549, 20);
     121      this.tbRemaining.TabIndex = 9;
    122122      //
    123123      // lblFiltered
    124124      //
    125       this.lblFiltered.AutoSize = true;
    126       this.lblFiltered.Location = new System.Drawing.Point(15, 47);
    127       this.lblFiltered.Name = "lblFiltered";
    128       this.lblFiltered.Size = new System.Drawing.Size(44, 13);
    129       this.lblFiltered.TabIndex = 8;
    130       this.lblFiltered.Text = "Filtered:";
     125      this.lblRemaining.AutoSize = true;
     126      this.lblRemaining.Location = new System.Drawing.Point(15, 47);
     127      this.lblRemaining.Name = "lblRemaining";
     128      this.lblRemaining.Size = new System.Drawing.Size(60, 13);
     129      this.lblRemaining.TabIndex = 8;
     130      this.lblRemaining.Text = "Remaining:";
    131131      //
    132132      // tbTotal
     
    276276    private System.Windows.Forms.Label lblPercentage;
    277277    private System.Windows.Forms.TextBox tbPercentage;
    278     private System.Windows.Forms.TextBox tbFiltered;
    279     private System.Windows.Forms.Label lblFiltered;
     278    private System.Windows.Forms.TextBox tbRemaining;
     279    private System.Windows.Forms.Label lblRemaining;
    280280    private System.Windows.Forms.RadioButton rBtnOr;
    281281    private System.Windows.Forms.RadioButton rBtnAnd;
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

    r11002 r11044  
    1818      InitializeComponent();
    1919      tbTotal.Text = "0";
    20       tbFiltered.Text = "0";
     20      tbRemaining.Text = "0";
    2121      tbPercentage.Text = "0%";
    2222    }
     
    6565        bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
    6666
    67         int filteredCnt = result.Count(c => c);
     67        int filteredCnt = result.Count(c => !c);
    6868
    69         tbFiltered.Text = filteredCnt.ToString();
     69        tbRemaining.Text = filteredCnt.ToString();
    7070        double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / (double)result.Length;
    7171        tbPercentage.Text = String.Format("{0:0.0000}%", percentage);
Note: See TracChangeset for help on using the changeset viewer.