Changeset 15466 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.Designer.cs

Timestamp:

11/09/17 11:51:37 (7 years ago)

Author:

pfleck

Message:

#2809: Simplified the overall filtering logic as suggested by bburlacu

• changed parameter names to actively reflect that filter means "remaining"
• moved filter combination logic to FilterContent
• simplified/restructured code

File:

• branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.Designer.cs (modified) (6 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.groupBoxFilter = new System.Windows.Forms.GroupBox();
-      this.checkedFilterView = new HeuristicLab.DataPreprocessing.Views.CheckedFilterCollectionView();
       this.groupBoxFilterInfo = new System.Windows.Forms.GroupBox();
       this.lblPercentage = new System.Windows.Forms.Label();
@@ -63 +62 @@
       this.label3 = new System.Windows.Forms.Label();
       this.bottomPanel = new System.Windows.Forms.Panel();
+      this.checkedFilterView = new HeuristicLab.DataPreprocessing.Views.CheckedFilterCollectionView();
       this.groupBoxFilter.SuspendLayout();
       this.groupBoxFilterInfo.SuspendLayout();
@@ -80 +80 @@
       this.groupBoxFilter.TabStop = false;
       this.groupBoxFilter.Text = "Filter";
-      // 
-      // checkedFilterView
-      // 
-      this.checkedFilterView.Caption = "filterView";
-      this.checkedFilterView.Content = null;
-      this.checkedFilterView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.checkedFilterView.Location = new System.Drawing.Point(3, 16);
-      this.checkedFilterView.Name = "checkedFilterView";
-      this.checkedFilterView.ReadOnly = false;
-      this.checkedFilterView.ShowDetails = true;
-      this.checkedFilterView.Size = new System.Drawing.Size(652, 308);
-      this.checkedFilterView.TabIndex = 0;
       // 
       // groupBoxFilterInfo
@@ -185 +173 @@
       this.rBtnOr.AutoSize = true;
       this.rBtnOr.Cursor = System.Windows.Forms.Cursors.Default;
-      this.rBtnOr.Enabled = false;
       this.rBtnOr.Location = new System.Drawing.Point(53, 6);
       this.rBtnOr.Name = "rBtnOr";
@@ -199 +186 @@
       this.rBtnAnd.Checked = true;
       this.rBtnAnd.Cursor = System.Windows.Forms.Cursors.Default;
-      this.rBtnAnd.Enabled = false;
       this.rBtnAnd.Location = new System.Drawing.Point(3, 6);
       this.rBtnAnd.Name = "rBtnAnd";
@@ -273 +259 @@
       this.bottomPanel.Size = new System.Drawing.Size(670, 30);
       this.bottomPanel.TabIndex = 13;
+      // 
+      // checkedFilterView
+      // 
+      this.checkedFilterView.Caption = "filterView";
+      this.checkedFilterView.Content = null;
+      this.checkedFilterView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.checkedFilterView.Location = new System.Drawing.Point(3, 16);
+      this.checkedFilterView.Name = "checkedFilterView";
+      this.checkedFilterView.ReadOnly = false;
+      this.checkedFilterView.ShowDetails = true;
+      this.checkedFilterView.Size = new System.Drawing.Size(652, 308);
+      this.checkedFilterView.TabIndex = 0;
       // 
       // FilterView