Changeset 10705 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

Timestamp:

04/02/14 13:47:19 (10 years ago)

Author:

sbreuer

Message:

• enhanced usability

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (5 diffs)

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

@@ -150 +150 @@
       findAndReplaceDialog.ReplaceAllEvent += findAndReplaceDialog_ReplaceAllEvent;
       findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceEvent;
+      findAndReplaceDialog.FormClosing += findAndReplaceDialog_FormClosing;
+    }
+
+    void findAndReplaceDialog_FormClosing(object sender, FormClosingEventArgs e) {
+      ResetHighlightedCells();
     }
 
@@ -161 +166 @@
     void findAndReplaceDialog_ReplaceAllEvent(object sender, EventArgs e) {
       Replace(FindAll(findAndReplaceDialog.GetSearchText()));
+      findAndReplaceDialog.SetEndReached(false);
     }
 
@@ -167 +173 @@
         searchIterator = new FindPreprocessingItemsIterator(FindAll(findAndReplaceDialog.GetSearchText()));
         currentSearchText = findAndReplaceDialog.GetSearchText();
-      }
-
-      while (searchIterator.MoveNext() && (searchIterator.GetCurrent() == null || !Content.GetValue(searchIterator.GetCurrent().Item1, searchIterator.GetCurrent().Item2).Equals(currentSearchText))) {
-        
-      }
-
-      if (searchIterator.GetCurrent() != null) {
-        HightlightedCells = TransformToDictionary(searchIterator.GetCurrent());
+        findAndReplaceDialog.SetEndReached(false);
+      }
+      
+      Tuple<int, int> currentCell = null;
+      bool moreOccurences = false;
+      do {
+        currentCell = searchIterator.GetCurrent();
+        moreOccurences = searchIterator.MoveNext();
+      } while (moreOccurences && (currentCell == null || !Content.GetValue(currentCell.Item2, currentCell.Item1).Equals(currentSearchText)));
+
+      if (!moreOccurences) {
+        findAndReplaceDialog.SetEndReached(true);
+      }
+
+      if (currentCell != null) {
+        HightlightedCells = TransformToDictionary(currentCell);
       } else {
-        HightlightedCells.Clear();
+        ResetHighlightedCells();
       }
     }
@@ -182 +196 @@
     void findAndReplaceDialog_FindAllEvent(object sender, EventArgs e) {
       HightlightedCells = FindAll(findAndReplaceDialog.GetSearchText());
+      findAndReplaceDialog.SetEndReached(false);
     }
 
@@ -228 +243 @@
       highlightCells.Add(tuple.Item1, new List<int>() { tuple.Item2 });
       return highlightCells;
+    }
+
+    private void ResetHighlightedCells() {
+      HightlightedCells = new Dictionary<int, IList<int>>();
     }