Changeset 10706 for branches/DataPreprocessing

Timestamp:

04/02/14 14:07:32 (11 years ago)

Author:

sbreuer

Message:

• start with search at the beginning when reached the end

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataGridContentView.cs (modified) (7 diffs)
• FindAndReplaceDialog.Designer.cs (modified) (7 diffs)
• FindAndReplaceDialog.cs (modified) (3 diffs)

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

@@ -37 +37 @@
     private IFindPreprocessingItemsIterator searchIterator;
     private string currentSearchText;
+    private Tuple<int, int> currentCell;
 
     public new IDataGridContent Content {
@@ -69 +70 @@
       _highlightedCells = new Dictionary<int, IList<int>>();
       _highlightedRowIndices = new List<int>();
+      currentCell = null;
     }
 
@@ -160 +162 @@
       if (searchIterator != null && searchIterator.GetCurrent() != null)
       {
-        Replace(TransformToDictionary(searchIterator.GetCurrent()));
+        Replace(TransformToDictionary(currentCell));
       }
     }
@@ -166 +168 @@
     void findAndReplaceDialog_ReplaceAllEvent(object sender, EventArgs e) {
       Replace(FindAll(findAndReplaceDialog.GetSearchText()));
-      findAndReplaceDialog.SetEndReached(false);
     }
 
@@ -173 +174 @@
         searchIterator = new FindPreprocessingItemsIterator(FindAll(findAndReplaceDialog.GetSearchText()));
         currentSearchText = findAndReplaceDialog.GetSearchText();
-        findAndReplaceDialog.SetEndReached(false);
       }
       
-      Tuple<int, int> currentCell = null;
       bool moreOccurences = false;
       do {
@@ -183 +182 @@
       } while (moreOccurences && (currentCell == null || !Content.GetValue(currentCell.Item2, currentCell.Item1).Equals(currentSearchText)));
 
-      if (!moreOccurences) {
-        findAndReplaceDialog.SetEndReached(true);
-      }
-
       if (currentCell != null) {
         HightlightedCells = TransformToDictionary(currentCell);
@@ -192 +187 @@
         ResetHighlightedCells();
       }
+
+      if (!moreOccurences) {
+        searchIterator.Reset();
+        ResetHighlightedCells();
+      }
     }
 
     void findAndReplaceDialog_FindAllEvent(object sender, EventArgs e) {
       HightlightedCells = FindAll(findAndReplaceDialog.GetSearchText());
-      findAndReplaceDialog.SetEndReached(false);
     }
 

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

@@ -37 +37 @@
       this.txtValue = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
-      this.lblEndReached = new System.Windows.Forms.Label();
       this.tabSearchReplace.SuspendLayout();
       this.tabReplace.SuspendLayout();
@@ -52 +51 @@
       this.tabSearchReplace.Name = "tabSearchReplace";
       this.tabSearchReplace.SelectedIndex = 0;
-      this.tabSearchReplace.Size = new System.Drawing.Size(564, 143);
+      this.tabSearchReplace.Size = new System.Drawing.Size(564, 132);
       this.tabSearchReplace.TabIndex = 0;
       this.tabSearchReplace.SelectedIndexChanged += new System.EventHandler(this.tabSearchReplace_SelectedIndexChanged);
@@ -61 +60 @@
       this.tabSearch.Name = "tabSearch";
       this.tabSearch.Padding = new System.Windows.Forms.Padding(3);
-      this.tabSearch.Size = new System.Drawing.Size(556, 109);
+      this.tabSearch.Size = new System.Drawing.Size(556, 117);
       this.tabSearch.TabIndex = 0;
       this.tabSearch.Text = "Search";
@@ -68 +67 @@
       // tabReplace
       // 
-      this.tabReplace.Controls.Add(this.lblEndReached);
       this.tabReplace.Controls.Add(this.txtSearchString);
       this.tabReplace.Controls.Add(this.lblSearch);
@@ -82 +80 @@
       this.tabReplace.Name = "tabReplace";
       this.tabReplace.Padding = new System.Windows.Forms.Padding(3);
-      this.tabReplace.Size = new System.Drawing.Size(556, 117);
+      this.tabReplace.Size = new System.Drawing.Size(556, 106);
       this.tabReplace.TabIndex = 1;
       this.tabReplace.Text = "Replace";
@@ -174 +172 @@
       this.label1.Text = "Replace with";
       // 
-      // lblEndReached
-      // 
-      this.lblEndReached.AutoSize = true;
-      this.lblEndReached.Location = new System.Drawing.Point(218, 100);
-      this.lblEndReached.Name = "lblEndReached";
-      this.lblEndReached.Size = new System.Drawing.Size(139, 13);
-      this.lblEndReached.TabIndex = 24;
-      this.lblEndReached.Text = "No more occurences found.";
-      // 
       // FindAndReplaceDialog
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(588, 167);
+      this.ClientSize = new System.Drawing.Size(588, 156);
       this.Controls.Add(this.tabSearchReplace);
       this.Name = "FindAndReplaceDialog";
@@ -213 +202 @@
     private System.Windows.Forms.TextBox txtValue;
     private System.Windows.Forms.Label label1;
-    private System.Windows.Forms.Label lblEndReached;
   }
 }

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

@@ -20 +20 @@
       cmbReplaceWith.Items.AddRange(cmbItemsText);
       cmbReplaceWith.SelectedIndex = (int)ReplaceAction.Value;
-      SetEndReached(false);
     }
 
@@ -31 +30 @@
       tabReplace.Focus();
       AddControlsToCurrentTab();
-    }
-
-    public void SetEndReached(bool endReached) {
-      lblEndReached.Visible = endReached;
     }
 
@@ -50 +45 @@
       tabSearchReplace.SelectedTab.Controls.Add(lblSearch);
       tabSearchReplace.SelectedTab.Controls.Add(txtSearchString);
-      tabSearchReplace.SelectedTab.Controls.Add(lblEndReached);
     }