Changeset 10762

Timestamp:

04/23/14 10:48:19 (10 years ago)

Author:

rstoll

Message:

• Renamed FindAndReplace to SearchAndReplace
• Added "Search" and "Replace" buttons to DataGrid

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataGridContentView.Designer.cs (modified) (7 diffs)
• DataGridContentView.cs (modified) (3 diffs)
• DataGridContentView.resx (added)
• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (2 diffs)
• SearchAndReplaceDialog.Designer.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FindAndReplaceDialog.Designer.cs) (3 diffs)
• SearchAndReplaceDialog.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FindAndReplaceDialog.cs) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.Designer.cs

@@ -54 +54 @@
       this.mostCommonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.interpolationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.btnSearch = new System.Windows.Forms.Button();
+      this.btnReplace = new System.Windows.Forms.Button();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.contextMenuCell.SuspendLayout();
@@ -80 +83 @@
       // btnApplySort
       // 
-      this.btnApplySort.Location = new System.Drawing.Point(241, 19);
+      this.btnApplySort.Location = new System.Drawing.Point(349, 19);
       this.btnApplySort.Name = "btnApplySort";
       this.btnApplySort.Size = new System.Drawing.Size(75, 23);
       this.btnApplySort.TabIndex = 7;
       this.btnApplySort.Text = "Apply Sort";
+      this.toolTip.SetToolTip(this.btnApplySort, "The current sorting is applied on the data itself.");
       this.btnApplySort.UseVisualStyleBackColor = true;
       this.btnApplySort.Click += new System.EventHandler(this.btnApplySort_Click);
@@ -93 +97 @@
             this.replaceValueToolStripMenuItem});
       this.contextMenuCell.Name = "contextMenuCell";
-      this.contextMenuCell.Size = new System.Drawing.Size(153, 48);
+      this.contextMenuCell.Size = new System.Drawing.Size(148, 26);
       // 
       // replaceValueToolStripMenuItem
@@ -104 +108 @@
             this.interpolationToolStripMenuItem});
       this.replaceValueToolStripMenuItem.Name = "replaceValueToolStripMenuItem";
-      this.replaceValueToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+      this.replaceValueToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
       this.replaceValueToolStripMenuItem.Text = "Replace Value";
       // 
@@ -142 +146 @@
       this.interpolationToolStripMenuItem.Click += new System.EventHandler(this.ReplaceWithInterpolation_Click);
       // 
+      // btnSearch
+      // 
+      this.btnSearch.Location = new System.Drawing.Point(201, 19);
+      this.btnSearch.Name = "btnSearch";
+      this.btnSearch.Size = new System.Drawing.Size(53, 23);
+      this.btnSearch.TabIndex = 8;
+      this.btnSearch.Text = "Search";
+      this.toolTip.SetToolTip(this.btnSearch, "Opens the Search dialog");
+      this.btnSearch.UseVisualStyleBackColor = true;
+      this.btnSearch.Click += new System.EventHandler(this.button1_Click);
+      // 
+      // btnReplace
+      // 
+      this.btnReplace.Location = new System.Drawing.Point(260, 19);
+      this.btnReplace.Name = "btnReplace";
+      this.btnReplace.Size = new System.Drawing.Size(55, 23);
+      this.btnReplace.TabIndex = 9;
+      this.btnReplace.Text = "Replace";
+      this.toolTip.SetToolTip(this.btnReplace, "Opens the Search & Replace dialog");
+      this.btnReplace.UseVisualStyleBackColor = true;
+      this.btnReplace.Click += new System.EventHandler(this.btnReplace_Click);
+      // 
       // DataGridContentView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.btnReplace);
+      this.Controls.Add(this.btnSearch);
       this.Controls.Add(this.btnApplySort);
       this.Name = "DataGridContentView";
@@ -155 +183 @@
       this.Controls.SetChildIndex(this.columnsTextBox, 0);
       this.Controls.SetChildIndex(this.btnApplySort, 0);
+      this.Controls.SetChildIndex(this.btnSearch, 0);
+      this.Controls.SetChildIndex(this.btnReplace, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.contextMenuCell.ResumeLayout(false);
@@ -172 +202 @@
     private System.Windows.Forms.ToolStripMenuItem mostCommonToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem interpolationToolStripMenuItem;
+    private System.Windows.Forms.Button btnSearch;
+    private System.Windows.Forms.Button btnReplace;
+    private System.Windows.Forms.ToolTip toolTip;
   }
 }

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

@@ -35 +35 @@
 
     private bool notOwnEvent = true;
-    private FindAndReplaceDialog findAndReplaceDialog;
+    private SearchAndReplaceDialog findAndReplaceDialog;
     private IFindPreprocessingItemsIterator searchIterator;
     private string currentSearchText;
@@ -159 +159 @@
 
     private void CreateFindAndReplaceDialog() {
-      findAndReplaceDialog = new FindAndReplaceDialog();
+      findAndReplaceDialog = new SearchAndReplaceDialog();
       findAndReplaceDialog.Show(this);
       HightlightedCellsBackground = GetSelectedCells();
@@ -399 +399 @@
       Content.PreprocessingDataManipulation.ReplaceIndicesByLinearInterpolationOfNeighbours(GetSelectedCells());
     }
+
+    private void button1_Click(object sender, EventArgs e) {
+      CreateFindAndReplaceDialog();
+      findAndReplaceDialog.ActivateSearch();
+    }
+
+    private void btnReplace_Click(object sender, EventArgs e) {
+      CreateFindAndReplaceDialog();
+      findAndReplaceDialog.ActivateReplace();
+    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

@@ -89 +89 @@
       <DependentUpon>FilterView.cs</DependentUpon>
     </Compile>
-    <Compile Include="FindAndReplaceDialog.cs">
+    <Compile Include="SearchAndReplaceDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FindAndReplaceDialog.Designer.cs">
-      <DependentUpon>FindAndReplaceDialog.cs</DependentUpon>
+    <Compile Include="SearchAndReplaceDialog.Designer.cs">
+      <DependentUpon>SearchAndReplaceDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="HistogramView.cs">
@@ -242 +242 @@
       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DataGridContentView.resx">
+      <DependentUpon>DataGridContentView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -1 +1 @@
 namespace HeuristicLab.DataPreprocessing.Views {
-  partial class FindAndReplaceDialog {
+  partial class SearchAndReplaceDialog {
     /// <summary>
     /// Required designer variable.
@@ -172 +172 @@
       this.label1.Text = "Replace with";
       // 
-      // FindAndReplaceDialog
+      // SearchAndReplaceDialog
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -180 +180 @@
       this.MaximizeBox = false;
       this.MinimizeBox = false;
-      this.Name = "FindAndReplaceDialog";
+      this.Name = "SearchAndReplaceDialog";
       this.ShowIcon = false;
       this.ShowInTaskbar = false;
-      this.Text = "Find and Replace";
+      this.Text = "Search and Replace";
       this.tabSearchReplace.ResumeLayout(false);
       this.tabReplace.ResumeLayout(false);

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

@@ -13 +13 @@
   }
 
-  public partial class FindAndReplaceDialog : Form {
+  public partial class SearchAndReplaceDialog : Form {
     private string[] cmbItemsText = { "Value", "Average", "Median", "Random", "Most Common", "Interpolation" };
 
-    public FindAndReplaceDialog() {
+    public SearchAndReplaceDialog() {
       InitializeComponent();
       cmbReplaceWith.Items.AddRange(cmbItemsText);