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

Timestamp:

05/28/14 15:34:34 (10 years ago)

Author:

rstoll

Message:

• Fixed FindAll -> selection was very slow, CopyOfStringConvertibleMatrix had registered an event as well which slowed down everything (more or less)

File:

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

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

@@ -74 +74 @@
       _highlightedCellsBackground = new Dictionary<int, IList<int>>();
       currentCell = null;
-      DataGridView.SelectionChanged += DataGridView_SelectionChanged;
-    }
-
-    void DataGridView_SelectionChanged(object sender, EventArgs e) {
-      if (!isSearching && Content != null) {
-        Content.DataGridLogic.SetSelection(GetSelectedCells());
+    }
+
+    protected override void dataGridView_SelectionChanged(object sender, EventArgs e) {
+      if (Content != null) {
+        if (!isSearching) {
+          base.dataGridView_SelectionChanged(sender, e);
+          Content.DataGridLogic.SetSelection(GetSelectedCells());
+        }
       }
     }
@@ -103 +105 @@
       OnContentChanged();
       searchIterator = null;
-    }   
+    }
 
     protected override void DeregisterContentEvents() {
@@ -129 +131 @@
       if (!dataGridView.ReadOnly) {
         string errorMessage;
-        if (Content != null){
+        if (Content != null) {
           if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered()) {
             errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode.";
@@ -192 +194 @@
     }
 
-    void DataGridView_SelectionChanged_FindAndReplace(object sender, EventArgs e) {
+    private void DataGridView_SelectionChanged_FindAndReplace(object sender, EventArgs e) {
       if (Content != null) {
         if (!isSearching && AreMultipleCellsSelected()) {
@@ -276 +278 @@
       isSearching = true;
       SuspendRepaint();
-      foreach (var column in FindAll(findAndReplaceDialog.GetSearchText())) {
+      var selectedCells = FindAll(findAndReplaceDialog.GetSearchText());
+      foreach (var column in selectedCells) {
         foreach (var cell in column.Value) {
           dataGridView[column.Key, cell].Selected = true;
@@ -283 +286 @@
       ResumeRepaint(true);
       isSearching = false;
-      DataGridView_SelectionChanged(null, null);
+      Content.DataGridLogic.SetSelection(selectedCells);
+      //update statistic in base
+      base.dataGridView_SelectionChanged(sender, e);
     }