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

Timestamp:

05/21/14 12:22:38 (10 years ago)

Author:

sbreuer

Message:

• offer search comparison options

File:

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

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

@@ -35 +35 @@
 
     private bool notOwnEvent = true;
+    private bool isSearching = false;
     private SearchAndReplaceDialog findAndReplaceDialog;
     private IFindPreprocessingItemsIterator searchIterator;
     private string currentSearchText;
+    private ComparisonOperation currentComparisonOperation;
     private Tuple<int, int> currentCell;
 
@@ -54 +56 @@
     }
 
-    private IDictionary<int, IList<int>> _highlightedCells;
-    public IDictionary<int, IList<int>> HightlightedCells {
-      get { return _highlightedCells; }
-      set {
-        _highlightedCells = value;
-        Refresh();
-      }
-    }
-
     private IDictionary<int, IList<int>> _highlightedCellsBackground;
     public IDictionary<int, IList<int>> HightlightedCellsBackground {
@@ -78 +71 @@
       dataGridView.KeyDown += dataGridView_KeyDown;
       contextMenuCell.Items.Add(ShowHideColumns);
-      _highlightedCells = new Dictionary<int, IList<int>>();
       _highlightedRowIndices = new List<int>();
       _highlightedCellsBackground = new Dictionary<int, IList<int>>();
@@ -86 +78 @@
 
     void DataGridView_SelectionChanged(object sender, EventArgs e) {
-      Content.DataGridLogic.SetSelection(GetSelectedCells());
+      if (!isSearching) {
+        Content.DataGridLogic.SetSelection(GetSelectedCells());
+      }
     }
 
@@ -179 +173 @@
     void DataGridView_SelectionChanged_FindAndReplace(object sender, EventArgs e) {
       if (Content != null) {
-        if (AreMultipleCellsSelected()) {
+        if (!isSearching && AreMultipleCellsSelected()) {
           ResetHighlightedCellsBackground();
           HightlightedCellsBackground = GetSelectedCells();
@@ -188 +182 @@
 
     void findAndReplaceDialog_FormClosing(object sender, FormClosingEventArgs e) {
-      ResetHighlightedCells();
       ResetHighlightedCellsBackground();
       searchIterator = null;
@@ -205 +198 @@
 
     void findAndReplaceDialog_FindNextEvent(object sender, EventArgs e) {
-      if (searchIterator == null || currentSearchText != findAndReplaceDialog.GetSearchText()) {
+      if (searchIterator == null || 
+        currentSearchText != findAndReplaceDialog.GetSearchText() || 
+        currentComparisonOperation != findAndReplaceDialog.GetComparisonOperation()) {
         searchIterator = new FindPreprocessingItemsIterator(FindAll(findAndReplaceDialog.GetSearchText()));
         currentSearchText = findAndReplaceDialog.GetSearchText();
-      }
+        currentComparisonOperation = findAndReplaceDialog.GetComparisonOperation();
+      }
+
       if (IsOneCellSelected()) {
         var first = GetSelectedCells().First();
@@ -214 +211 @@
       }
 
-
       bool moreOccurences = false;
-      do {
-        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();
-
+      currentCell = searchIterator.GetCurrent();
+      moreOccurences = searchIterator.MoveNext();
+      if (IsOneCellSelected() && currentCell != null) {
+        var first = GetSelectedCells().First();
+        if (currentCell.Item1 == first.Key && currentCell.Item2 == first.Value[0]) {
+          if (!moreOccurences) {
+            searchIterator.Reset();
           }
-        }
-      } while (moreOccurences && (currentCell == null || !Content.GetValue(currentCell.Item2, currentCell.Item1).Equals(currentSearchText)));
+          currentCell = searchIterator.GetCurrent();
+          moreOccurences = searchIterator.MoveNext();
+          if (!moreOccurences) {
+            searchIterator.Reset();
+          }
+        }
+      }
+
+      dataGridView.ClearSelection();
 
       if (currentCell != null) {
-        dataGridView.ClearSelection();
         dataGridView[currentCell.Item1, currentCell.Item2].Selected = true;
-      } else {
-        ResetHighlightedCells();
-      }
-
-      //if (!moreOccurences) {
-      //  searchIterator.Reset();
-      //  dataGridView.ClearSelection();
-      //  currentCell = searchIterator.GetCurrent();
-      //  dataGridView[currentCell.Item1, currentCell.Item2].Selected = true;
-      //}
+      }
     }
 
@@ -264 +252 @@
 
     void findAndReplaceDialog_FindAllEvent(object sender, EventArgs e) {
-      HightlightedCells = FindAll(findAndReplaceDialog.GetSearchText());
+      dataGridView.ClearSelection();
+      isSearching = true;
+      foreach (var column in FindAll(findAndReplaceDialog.GetSearchText())) {
+        foreach (var cell in column.Value) {
+          dataGridView[column.Key, cell].Selected = true;
+        }
+      }
+      isSearching = false;
+      DataGridView_SelectionChanged(null, null);
+    }
+
+    private Core.ConstraintOperation GetConstraintOperation(ComparisonOperation comparisonOperation) {
+      Core.ConstraintOperation constraintOperation = Core.ConstraintOperation.Equal;
+      switch (comparisonOperation) {
+        case ComparisonOperation.Equal:
+          constraintOperation = Core.ConstraintOperation.Equal;
+          break;
+        case ComparisonOperation.Greater:
+          constraintOperation = Core.ConstraintOperation.Greater;
+          break;
+        case ComparisonOperation.GreaterOrEqual:
+          constraintOperation = Core.ConstraintOperation.GreaterOrEqual;
+          break;
+        case ComparisonOperation.Less:
+          constraintOperation = Core.ConstraintOperation.Less;
+          break;
+        case ComparisonOperation.LessOrEqual:
+          constraintOperation = Core.ConstraintOperation.LessOrEqual;
+          break;
+        case ComparisonOperation.NotEqual:
+          constraintOperation = Core.ConstraintOperation.NotEqual;
+          break;
+      }
+      return constraintOperation;
     }
 
     private IDictionary<int, IList<int>> FindAll(string match) {
       bool searchInSelection = HightlightedCellsBackground.Values.Sum(list => list.Count) > 1;
-      var comparisonFilter = new ComparisonFilter(Content.FilterLogic.PreprocessingData, Core.ConstraintOperation.Equal, new StringValue(match), true);
+      ComparisonOperation comparisonOperation = findAndReplaceDialog.GetComparisonOperation();
+      var comparisonFilter = new ComparisonFilter(Content.FilterLogic.PreprocessingData, GetConstraintOperation(comparisonOperation), new StringValue(match), true);
       var filters = new List<Filter.IFilter>() { comparisonFilter };
       var foundCells = new Dictionary<int, IList<int>>();
@@ -324 +346 @@
     }
 
-    private void ResetHighlightedCells() {
-      HightlightedCells = new Dictionary<int, IList<int>>();
-    }
-
     private void ResetHighlightedCellsBackground() {
       HightlightedCellsBackground = new Dictionary<int, IList<int>>();
@@ -374 +392 @@
       if (e.State.HasFlag(DataGridViewElementStates.Selected)) return;
       if (!e.PaintParts.HasFlag(DataGridViewPaintParts.Background)) return;
-      if (HighlightedRowIndices == null && HightlightedCells == null) return;
+      if (HighlightedRowIndices == null) return;
 
       int rowIndex = virtualRowIndices[e.RowIndex];
@@ -382 +400 @@
       if (HightlightedCellsBackground.ContainsKey(e.ColumnIndex) && HightlightedCellsBackground[e.ColumnIndex].Contains(e.RowIndex)) {
         backColor = Color.LightGray;
-      }
-      if (HighlightedRowIndices.Contains(rowIndex) || HightlightedCells.ContainsKey(e.ColumnIndex) && HightlightedCells[e.ColumnIndex].Contains(e.RowIndex)) {
-        backColor = Color.LightGreen;
       }