Changeset 10930

Timestamp:

06/04/14 10:51:34 (10 years ago)

Author:

rstoll

Message:

• Disabled Replace tab in SearchAndReplaceDialog if a filter is active
• Disabled Replace button in DataGridview if filter is active
• Refactored/Changed IFilterLogic#IsFiltered from method to property

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/SearchAndReplaceDialog.Designer.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/SearchAndReplaceDialog.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/FilterLogic.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IFilterLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -102 +102 @@
     }
 
-    void FilterLogic_FilterChanged(object sender, EventArgs e) {
-      OnContentChanged();
-      searchIterator = null;
-    }
-
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
       Content.Changed -= Content_Changed;
       Content.FilterLogic.FilterChanged -= FilterLogic_FilterChanged;
+    }
+
+    void FilterLogic_FilterChanged(object sender, EventArgs e) {
+      OnContentChanged();
+      searchIterator = null;
+      if (findAndReplaceDialog != null && !findAndReplaceDialog.IsDisposed) {
+        if (Content.FilterLogic.IsFiltered) {
+          findAndReplaceDialog.DisableReplace();
+        } else {
+          findAndReplaceDialog.EnableReplace();
+        }
+      }
+      btnReplace.Enabled = !Content.FilterLogic.IsFiltered;
     }
 
@@ -132 +140 @@
         string errorMessage;
         if (Content != null) {
-          if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered()) {
+          if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered) {
             errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode.";
           } else {
@@ -191 +199 @@
         searchIterator = null;
         DataGridView.SelectionChanged += DataGridView_SelectionChanged_FindAndReplace;
+        if (Content.FilterLogic.IsFiltered) {
+          findAndReplaceDialog.DisableReplace();
+        }
       }
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SearchAndReplaceDialog.Designer.cs

@@ -27 +27 @@
       this.tabSearch = new System.Windows.Forms.TabPage();
       this.tabReplace = new System.Windows.Forms.TabPage();
+      this.cmbComparisonOperator = new System.Windows.Forms.ComboBox();
       this.txtSearchString = new System.Windows.Forms.TextBox();
       this.lblSearch = new System.Windows.Forms.Label();
@@ -37 +38 @@
       this.txtValue = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
-      this.cmbComparisonOperator = new System.Windows.Forms.ComboBox();
       this.tabSearchReplace.SuspendLayout();
       this.tabReplace.SuspendLayout();
@@ -87 +87 @@
       this.tabReplace.UseVisualStyleBackColor = true;
       // 
+      // cmbComparisonOperator
+      // 
+      this.cmbComparisonOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cmbComparisonOperator.FormattingEnabled = true;
+      this.cmbComparisonOperator.Location = new System.Drawing.Point(103, 19);
+      this.cmbComparisonOperator.Name = "cmbComparisonOperator";
+      this.cmbComparisonOperator.Size = new System.Drawing.Size(45, 21);
+      this.cmbComparisonOperator.TabIndex = 24;
+      // 
       // txtSearchString
       // 
@@ -173 +182 @@
       this.label1.TabIndex = 14;
       this.label1.Text = "Replace with";
-      // 
-      // cmbComparisonOperator
-      // 
-      this.cmbComparisonOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.cmbComparisonOperator.FormattingEnabled = true;
-      this.cmbComparisonOperator.Location = new System.Drawing.Point(103, 19);
-      this.cmbComparisonOperator.Name = "cmbComparisonOperator";
-      this.cmbComparisonOperator.Size = new System.Drawing.Size(45, 21);
-      this.cmbComparisonOperator.TabIndex = 24;
       // 
       // SearchAndReplaceDialog

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/SearchAndReplaceDialog.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 
@@ -22 +21 @@
   }
 
+
+
   public partial class SearchAndReplaceDialog : Form {
     private string[] cmbItemsText = { "Value", "Average", "Median", "Random", "Most Common", "Interpolation" };
@@ -42 +43 @@
       tabSearchReplace.SelectTab(tabReplace);
       AddControlsToCurrentTab();
+    }
+
+    public void DisableReplace() {
+      tabSearchReplace.SelectTab(tabSearch);
+      tabReplace.Enabled = false;
+    }
+
+    public void EnableReplace() {
+      tabReplace.Enabled = true;
     }
 
@@ -97 +107 @@
       remove { btnReplace.Click -= value; }
     }
-      
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/FilterLogic.cs

@@ -82 +82 @@
     }
 
-    public bool IsFiltered() {
-      return preprocessingData.IsFiltered;
+    public bool IsFiltered {
+      get {
+        return preprocessingData.IsFiltered;
+      }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IFilterLogic.cs

@@ -36 +36 @@
     IPreprocessingData PreprocessingData { get; }
     void Reset();
-    bool IsFiltered();
+    bool IsFiltered { get; }
 
     event EventHandler FilterChanged;