Changeset 14075 for stable/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

Timestamp:

07/14/16 22:38:23 (8 years ago)

Author:

mkommend

Message:

#2559: Merged r13502, r13504, r13507, r13508, r13512, r13514, r13517 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs (modified) (8 diffs)

stable/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
 using HeuristicLab.Collections;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.DataPreprocessing.Filter;
 using HeuristicLab.MainForm;
@@ -22 +40 @@
     }
 
-    private void InitData()
-    {
-        checkedFilterView.Content = Content.Filters;
-        checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
-        checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
-        checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
+    private void InitData() {
+      checkedFilterView.Content = Content.Filters;
+      checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
+      checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
+      checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
     }
 
@@ -35 +52 @@
     }
 
-    protected override void OnContentChanged()
-    {
+    protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content != null)
-      {
+      if (Content != null) {
         InitData();
         UpdateFilterInfo();
@@ -46 +61 @@
 
     private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
-      if (Content != null)
-      {
-        foreach (IFilter filter in e.Items)
-        {
+      if (Content != null) {
+        foreach (IFilter filter in e.Items) {
           filter.Active = checkedFilterView.Content.ItemChecked(filter);
         }
@@ -57 +70 @@
 
     private void UpdateFilterInfo() {
-        List<IFilter> filters = Content.Filters.ToList();
-        int activeFilters = filters.Count(c => c.Active);
-        applyFilterButton.Enabled = (activeFilters > 0);
-        rBtnAnd.Enabled = (activeFilters > 0);
-        rBtnOr.Enabled = (activeFilters > 0);
-        Content.FilterLogic.Reset();
-        bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
+      List<IFilter> filters = Content.Filters.ToList();
+      int activeFilters = filters.Count(c => c.Active);
+      applyFilterButton.Enabled = (activeFilters > 0);
+      rBtnAnd.Enabled = (activeFilters > 0);
+      rBtnOr.Enabled = (activeFilters > 0);
+      Content.FilterLogic.Reset();
+      bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
 
-        int filteredCnt = result.Count(c => !c);
+      int filteredCnt = result.Count(c => !c);
 
-        tbRemaining.Text = filteredCnt.ToString();
-        double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / (double)result.Length;
-        tbPercentage.Text = String.Format("{0:0.0000}%", percentage);
-        tbTotal.Text = result.Length.ToString();
+      tbRemaining.Text = filteredCnt.ToString();
+      double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / (double)result.Length;
+      tbPercentage.Text = String.Format("{0:0.0000}%", percentage);
+      tbTotal.Text = result.Length.ToString();
     }
 
     private void applyFilterButton_Click(object sender, EventArgs e) {
-      if (Content != null)
-      {
+      if (Content != null) {
         List<IFilter> filters = Content.Filters.ToList();
         //apply filters
@@ -81 +93 @@
         //deactivate checked filters
         filters = checkedFilterView.Content.CheckedItems.ToList();
-        foreach (IFilter filter in filters)
-        {
+        foreach (IFilter filter in filters) {
           checkedFilterView.Content.SetItemCheckedState(filter, false);
           filter.Active = false;
@@ -92 +103 @@
     //whenever a new filter is added the preprocessing data is set to the filter
     private void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
-      if (Content != null)
-      {
-        foreach (IFilter filter in e.Items)
-        {
+      if (Content != null) {
+        foreach (IFilter filter in e.Items) {
           filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
         }
@@ -102 +111 @@
 
     private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IFilter> e) {
-      if (Content != null)
-      {
+      if (Content != null) {
         UpdateFilterInfo();
       }
     }
 
-    private void rBtnAnd_CheckedChanged(object sender, EventArgs e)
-    {
-      if (Content != null)
-      {
+    private void rBtnAnd_CheckedChanged(object sender, EventArgs e) {
+      if (Content != null) {
         UpdateFilterInfo();
         Content.IsAndCombination = rBtnAnd.Checked;