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

Timestamp:

05/14/14 15:32:47 (10 years ago)

Author:

rstoll

Message:

• Search improved

take into account the selected cell when starting a search
updating data during search
updating data when dialog is closed and opened
changed selection during search from highlighting to actual selection (benefit, line chart will be selected according the search)

File:

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

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

@@ -88 +88 @@
       if (Content != null) {
         Content.DataGridLogic.SetSelection(GetSelectedCells());
+        if (AreMultipleCellsSelected()) {
+          ResetHighlightedCellsBackground();
+          HightlightedCellsBackground = GetSelectedCells();
+          searchIterator = null;
+        }
       }
     }
@@ -120 +125 @@
         }
       }
+      searchIterator = null;
     }
 
@@ -164 +170 @@
       findAndReplaceDialog = new SearchAndReplaceDialog();
       findAndReplaceDialog.Show(this);
-      HightlightedCellsBackground = GetSelectedCells();
-      dataGridView.ClearSelection();
+      if (AreMultipleCellsSelected()) {
+        HightlightedCellsBackground = GetSelectedCells();
+        dataGridView.ClearSelection();
+      }
       findAndReplaceDialog.FindAllEvent += findAndReplaceDialog_FindAllEvent;
       findAndReplaceDialog.FindNextEvent += findAndReplaceDialog_FindNextEvent;
@@ -171 +179 @@
       findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceEvent;
       findAndReplaceDialog.FormClosing += findAndReplaceDialog_FormClosing;
+      searchIterator = null;
     }
 
@@ -176 +185 @@
       ResetHighlightedCells();
       ResetHighlightedCellsBackground();
+      searchIterator = null;
     }
 
@@ -193 +203 @@
         currentSearchText = findAndReplaceDialog.GetSearchText();
       }
+      if (IsOneCellSelected()) {
+        var first = GetSelectedCells().First();
+        searchIterator.SetStartCell(first.Key, first.Value[0]);
+      }
+
 
       bool moreOccurences = false;
@@ -198 +213 @@
         currentCell = searchIterator.GetCurrent();
         moreOccurences = searchIterator.MoveNext();
+        if (IsOneCellSelected()) {
+          var first = GetSelectedCells().First();
+          if (currentCell.Item1 == first.Key && currentCell.Item2 == first.Value[0]) {
+            if (!moreOccurences) {
+              searchIterator.Reset();
+            }
+            currentCell = searchIterator.GetCurrent();
+            moreOccurences = searchIterator.MoveNext();
+
+          }
+        }
       } while (moreOccurences && (currentCell == null || !Content.GetValue(currentCell.Item2, currentCell.Item1).Equals(currentSearchText)));
 
       if (currentCell != null) {
-        HightlightedCells = TransformToDictionary(currentCell);
-        dataGridView.FirstDisplayedCell = dataGridView[currentCell.Item1, currentCell.Item2];
+        dataGridView.ClearSelection();
+        dataGridView[currentCell.Item1, currentCell.Item2].Selected = true;
       } else {
         ResetHighlightedCells();
       }
 
-      if (!moreOccurences) {
-        searchIterator.Reset();
-      }
+      //if (!moreOccurences) {
+      //  searchIterator.Reset();
+      //  dataGridView.ClearSelection();
+      //  currentCell = searchIterator.GetCurrent();
+      //  dataGridView[currentCell.Item1, currentCell.Item2].Selected = true;
+      //}
+    }
+
+    private bool AreMultipleCellsSelected() {
+      return GetSelectedCellCount() > 1;
+    }
+
+    private bool IsOneCellSelected() {
+      return GetSelectedCellCount() == 1;
+    }
+
+    private int GetSelectedCellCount() {
+      int count = 0;
+      foreach (var column in GetSelectedCells()) {
+        count += column.Value.Count();
+      }
+      return count;
     }