Changeset 10933


Ignore:
Timestamp:
06/04/14 12:28:46 (8 years ago)
Author:
psteiner
Message:

filter: removed resetbtn, added filterInfo, deactivation on apply filters

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

    r10785 r10933  
    4141      this.rBtnOr = new System.Windows.Forms.RadioButton();
    4242      this.rBtnAnd = new System.Windows.Forms.RadioButton();
    43       this.btnReset = new System.Windows.Forms.Button();
     43      this.groupBox1 = new System.Windows.Forms.GroupBox();
     44      this.label1 = new System.Windows.Forms.Label();
     45      this.label2 = new System.Windows.Forms.Label();
     46      this.label3 = new System.Windows.Forms.Label();
     47      this.label4 = new System.Windows.Forms.Label();
    4448      this.groupBoxFilter.SuspendLayout();
    4549      this.groupBoxFilterInfo.SuspendLayout();
     50      this.groupBox1.SuspendLayout();
    4651      this.SuspendLayout();
    4752      //
     
    8287      this.groupBoxFilterInfo.Location = new System.Drawing.Point(4, 337);
    8388      this.groupBoxFilterInfo.Name = "groupBoxFilterInfo";
    84       this.groupBoxFilterInfo.Size = new System.Drawing.Size(659, 130);
     89      this.groupBoxFilterInfo.Size = new System.Drawing.Size(659, 102);
    8590      this.groupBoxFilterInfo.TabIndex = 1;
    8691      this.groupBoxFilterInfo.TabStop = false;
    87       this.groupBoxFilterInfo.Text = "Filter Info";
     92      this.groupBoxFilterInfo.Text = "Filter Preview";
    8893      //
    8994      // lblPercentage
     
    148153      this.applyFilterButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    149154      this.applyFilterButton.Enabled = false;
    150       this.applyFilterButton.Location = new System.Drawing.Point(554, 474);
     155      this.applyFilterButton.Location = new System.Drawing.Point(554, 628);
    151156      this.applyFilterButton.Name = "applyFilterButton";
    152157      this.applyFilterButton.Size = new System.Drawing.Size(107, 23);
     
    161166      this.rBtnOr.AutoSize = true;
    162167      this.rBtnOr.Enabled = false;
    163       this.rBtnOr.Location = new System.Drawing.Point(60, 480);
     168      this.rBtnOr.Location = new System.Drawing.Point(60, 634);
    164169      this.rBtnOr.Name = "rBtnOr";
    165170      this.rBtnOr.Size = new System.Drawing.Size(36, 17);
     
    174179      this.rBtnAnd.Checked = true;
    175180      this.rBtnAnd.Enabled = false;
    176       this.rBtnAnd.Location = new System.Drawing.Point(10, 480);
     181      this.rBtnAnd.Location = new System.Drawing.Point(10, 634);
    177182      this.rBtnAnd.Name = "rBtnAnd";
    178183      this.rBtnAnd.Size = new System.Drawing.Size(44, 17);
     
    183188      this.rBtnAnd.CheckedChanged += new System.EventHandler(this.rBtnAnd_CheckedChanged);
    184189      //
    185       // btnReset
    186       //
    187       this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    188       this.btnReset.Enabled = false;
    189       this.btnReset.Location = new System.Drawing.Point(473, 473);
    190       this.btnReset.Name = "btnReset";
    191       this.btnReset.Size = new System.Drawing.Size(75, 23);
    192       this.btnReset.TabIndex = 5;
    193       this.btnReset.Text = "Reset";
    194       this.btnReset.UseVisualStyleBackColor = true;
    195       this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
     190      // groupBox1
     191      //
     192      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     193            | System.Windows.Forms.AnchorStyles.Right)));
     194      this.groupBox1.Controls.Add(this.label4);
     195      this.groupBox1.Controls.Add(this.label1);
     196      this.groupBox1.Controls.Add(this.label2);
     197      this.groupBox1.Controls.Add(this.label3);
     198      this.groupBox1.Location = new System.Drawing.Point(7, 445);
     199      this.groupBox1.Name = "groupBox1";
     200      this.groupBox1.Size = new System.Drawing.Size(659, 130);
     201      this.groupBox1.TabIndex = 12;
     202      this.groupBox1.TabStop = false;
     203      this.groupBox1.Text = "Filter Info";
     204      //
     205      // label1
     206      //
     207      this.label1.AutoSize = true;
     208      this.label1.Location = new System.Drawing.Point(15, 74);
     209      this.label1.Name = "label1";
     210      this.label1.Size = new System.Drawing.Size(529, 13);
     211      this.label1.TabIndex = 11;
     212      this.label1.Text = "All preprocessing views are updated when a filter gets activated or deactivated b" +
     213    "ut the unfiltered rows still exist.";
     214      //
     215      // label2
     216      //
     217      this.label2.AutoSize = true;
     218      this.label2.Location = new System.Drawing.Point(15, 47);
     219      this.label2.Name = "label2";
     220      this.label2.Size = new System.Drawing.Size(402, 13);
     221      this.label2.TabIndex = 8;
     222      this.label2.Text = "In the Filter Preview all effects of the activated filters on the dataset are sum" +
     223    "marized.";
     224      //
     225      // label3
     226      //
     227      this.label3.AutoSize = true;
     228      this.label3.Location = new System.Drawing.Point(15, 21);
     229      this.label3.Name = "label3";
     230      this.label3.Size = new System.Drawing.Size(249, 13);
     231      this.label3.TabIndex = 6;
     232      this.label3.Text = "A filter specifies the data rows which should remain.";
     233      //
     234      // label4
     235      //
     236      this.label4.AutoSize = true;
     237      this.label4.Location = new System.Drawing.Point(15, 98);
     238      this.label4.Name = "label4";
     239      this.label4.Size = new System.Drawing.Size(455, 13);
     240      this.label4.TabIndex = 12;
     241      this.label4.Text = "The Apply Filter Button permanently activates the filters. This means unfiltered " +
     242    "rows are deleted.";
    196243      //
    197244      // FilterView
     
    199246      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    200247      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    201       this.Controls.Add(this.btnReset);
     248      this.Controls.Add(this.groupBox1);
    202249      this.Controls.Add(this.rBtnAnd);
    203250      this.Controls.Add(this.rBtnOr);
     
    206253      this.Controls.Add(this.groupBoxFilter);
    207254      this.Name = "FilterView";
    208       this.Size = new System.Drawing.Size(670, 506);
     255      this.Size = new System.Drawing.Size(670, 660);
    209256      this.groupBoxFilter.ResumeLayout(false);
    210257      this.groupBoxFilterInfo.ResumeLayout(false);
    211258      this.groupBoxFilterInfo.PerformLayout();
     259      this.groupBox1.ResumeLayout(false);
     260      this.groupBox1.PerformLayout();
    212261      this.ResumeLayout(false);
    213262      this.PerformLayout();
     
    229278    private System.Windows.Forms.RadioButton rBtnAnd;
    230279    private CheckedFilterCollectionView checkedFilterView;
    231     private System.Windows.Forms.Button btnReset;
     280    private System.Windows.Forms.GroupBox groupBox1;
     281    private System.Windows.Forms.Label label4;
     282    private System.Windows.Forms.Label label1;
     283    private System.Windows.Forms.Label label2;
     284    private System.Windows.Forms.Label label3;
    232285
    233286
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

    r10900 r10933  
    6565        rBtnAnd.Enabled = (activeFilters > 0);
    6666        rBtnOr.Enabled = (activeFilters > 0);
    67         btnReset.Enabled = (activeFilters > 0);
     67        //btnReset.Enabled = (activeFilters > 0);
    6868        Content.FilterLogic.Reset();
    6969        bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
     
    8181      {
    8282        List<IFilter> filters = Content.Filters.ToList();
     83        //apply filters
    8384        Content.FilterLogic.Apply(filters, rBtnAnd.Checked);
     85        //deactivate checked filters
     86        filters = checkedFilterView.Content.CheckedItems.ToList();
     87        foreach (IFilter filter in filters)
     88        {
     89          checkedFilterView.Content.SetItemCheckedState(filter, false);
     90          filter.Active = false;
     91        }
     92        UpdateFilterInfo();
    8493      }
    8594    }
     
    112121    }
    113122
     123    /*
    114124    private void btnReset_Click(object sender, EventArgs e)
    115125    {
     
    119129      }
    120130    }
     131     * */
    121132
    122133  }
Note: See TracChangeset for help on using the changeset viewer.