Changeset 10852

Timestamp:

05/14/14 15:32:47 (11 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)

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataGridContentView.cs (modified) (7 diffs)
• Utils/FindPreprocessingItemsIterator.cs (modified) (3 diffs)
• Utils/IFindPreprocessingItemsIterator.cs (modified) (2 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;
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Utils/FindPreprocessingItemsIterator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -33 +32 @@
       this.items = items;
       Reset();
+    }
+
+
+    public void SetStartCell(int columnIndex, int rowIndex) {
+      Tuple<int, int> startCell = GetNextFoundCell(columnIndex, rowIndex);
+      int tmpColumnIndex = columnIndex + 1;
+      while (startCell == null && tmpColumnIndex != columnIndex) {
+        if (!items.ContainsKey(tmpColumnIndex)) {
+          tmpColumnIndex = 0;
+        }
+        startCell = GetNextFoundCell(tmpColumnIndex, 0);
+        ++tmpColumnIndex;
+      }
+      currentCell = startCell;
+    }
+
+    private Tuple<int, int> GetNextFoundCell(int columnIndex, int rowIndex) {
+      Tuple<int, int> next = null;
+      for (int i = 0; i < items[columnIndex].Count; ++i) {
+        if (items[columnIndex][i] >= rowIndex) {
+          next = new Tuple<int, int>(columnIndex, i);
+          break;
+        }
+      }
+      return next;
     }
 
@@ -54 +78 @@
 
     public Tuple<int, int> GetCurrent() {
-      Tuple<int, int> resultCells = null;
+      Tuple<int, int> resultCell = null;
       if (items != null && CurrentCellExists()) {
         int cellRow = items[currentCell.Item1].ElementAt(currentCell.Item2);
-        resultCells = new Tuple<int, int>(currentCell.Item1, cellRow);
+        resultCell = new Tuple<int, int>(currentCell.Item1, cellRow);
       }
-      return resultCells;
+      return resultCell;
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Utils/IFindPreprocessingItemsIterator.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -28 +27 @@
     bool MoveNext();
     void Reset();
+    void SetStartCell(int columnIndex, int rowIndex);
   }
 }