Changeset 10916 for branches

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)

Location:

branches/DataPreprocessing

Files:

• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/CopyOfStringConvertibleMatrixView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (6 diffs)

branches/DataPreprocessing/HeuristicLab 3.3.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
   ProjectSection(SolutionItems) = preProject
@@ -10 +8 @@
     ..\documentation\License\gpl-3.0.txt = ..\documentation\License\gpl-3.0.txt
     MergeConfigs.cmd = MergeConfigs.cmd
+    Performance1.psess = Performance1.psess
     PreBuildEvent.cmd = PreBuildEvent.cmd
   EndProjectSection
@@ -1922 +1921 @@
     HideSolutionNode = FALSE
   EndGlobalSection
+  GlobalSection(Performance) = preSolution
+    HasPerformanceSessions = true
+  EndGlobalSection
 EndGlobal

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

@@ -79 +79 @@
     }
 
+    // Was private before
+    protected virtual void dataGridView_SelectionChanged(object sender, EventArgs e) {
+      string stringFormat = "{0,20:0.0000}";
+      statisticsTextBox.Text = string.Empty;
+      if (dataGridView.SelectedCells.Count > 1) {
+        List<double> selectedValues = new List<double>();
+        foreach (DataGridViewCell cell in dataGridView.SelectedCells) {
+          double value;
+          if (!double.TryParse(cell.Value.ToString(), out value)) return;
+          selectedValues.Add(value);
+        }
+        if (selectedValues.Count > 1) {
+          StringBuilder labelText = new StringBuilder();
+          labelText.Append("Count: " + string.Format(stringFormat, selectedValues.Count) + "    ");
+          labelText.Append("Sum: " + string.Format(stringFormat, selectedValues.Sum()) + "    ");
+          labelText.Append("Min: " + string.Format(stringFormat, selectedValues.Min()) + "    ");
+          labelText.Append("Max: " + string.Format(stringFormat, selectedValues.Max()) + "    ");
+          labelText.Append("Average: " + string.Format(stringFormat, selectedValues.Average()) + "    ");
+          labelText.Append("Standard Deviation: " + string.Format(stringFormat, selectedValues.StandardDeviation()) + "    ");
+
+          statisticsTextBox.Text = labelText.ToString();
+        }
+      }
+    }
+
     #region unchanged copied from original - see  HeuristicLab.Data.Views.StringConvertibleMatrix
 
@@ -572 +597 @@
     }
 
-    private void dataGridView_SelectionChanged(object sender, EventArgs e) {
-      string stringFormat = "{0,20:0.0000}";
-      statisticsTextBox.Text = string.Empty;
-      if (dataGridView.SelectedCells.Count > 1) {
-        List<double> selectedValues = new List<double>();
-        foreach (DataGridViewCell cell in dataGridView.SelectedCells) {
-          double value;
-          if (!double.TryParse(cell.Value.ToString(), out value)) return;
-          selectedValues.Add(value);
-        }
-        if (selectedValues.Count > 1) {
-          StringBuilder labelText = new StringBuilder();
-          labelText.Append("Count: " + string.Format(stringFormat, selectedValues.Count) + "    ");
-          labelText.Append("Sum: " + string.Format(stringFormat, selectedValues.Sum()) + "    ");
-          labelText.Append("Min: " + string.Format(stringFormat, selectedValues.Min()) + "    ");
-          labelText.Append("Max: " + string.Format(stringFormat, selectedValues.Max()) + "    ");
-          labelText.Append("Average: " + string.Format(stringFormat, selectedValues.Average()) + "    ");
-          labelText.Append("Standard Deviation: " + string.Format(stringFormat, selectedValues.StandardDeviation()) + "    ");
-
-          statisticsTextBox.Text = labelText.ToString();
-        }
-      }
-    }
+   
   }
     #endregion

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);
     }