Changeset 17056

Timestamp:

07/04/19 13:05:02 (5 years ago)

Author:

mkommend

Message:

#2879: Merged r15619 into stable.

File:

• stable/HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (10 diffs)

stable/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -390 +390 @@
         DataRow row = (DataRow)sender;
         Series series = chart.Series[row.Name];
-        series.Points.Clear();
+        ClearPoints(series.Points);
         ConfigureSeries(series, row);
         if (!invisibleSeries.Contains(series)) {
@@ -418 +418 @@
           Series rowSeries = chart.Series[row.Name];
           if (!invisibleSeries.Contains(rowSeries)) {
-            rowSeries.Points.Clear();
+            ClearPoints(rowSeries.Points);
             FillSeriesWithRowValues(rowSeries, row);
             RecalculateAxesScale(chart.ChartAreas[0]);
@@ -435 +435 @@
           Series rowSeries = chart.Series[row.Name];
           if (!invisibleSeries.Contains(rowSeries)) {
-            rowSeries.Points.Clear();
+            ClearPoints(rowSeries.Points);
             FillSeriesWithRowValues(rowSeries, row);
             RecalculateAxesScale(chart.ChartAreas[0]);
@@ -453 +453 @@
           if (!invisibleSeries.Contains(rowSeries)) {
             if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
-              rowSeries.Points.Clear();
+              ClearPoints(rowSeries.Points);
               FillSeriesWithRowValues(rowSeries, row);
             } else {
@@ -480 +480 @@
           Series rowSeries = chart.Series[row.Name];
           if (!invisibleSeries.Contains(rowSeries)) {
-            rowSeries.Points.Clear();
+            ClearPoints(rowSeries.Points);
             FillSeriesWithRowValues(rowSeries, row);
             RecalculateAxesScale(chart.ChartAreas[0]);
@@ -498 +498 @@
           Series rowSeries = chart.Series[row.Name];
           if (!invisibleSeries.Contains(rowSeries)) {
-            rowSeries.Points.Clear();
+            ClearPoints(rowSeries.Points);
             FillSeriesWithRowValues(rowSeries, row);
             RecalculateAxesScale(chart.ChartAreas[0]);
@@ -541 +541 @@
     private void ToggleSeriesVisible(Series series) {
       if (!invisibleSeries.Contains(series)) {
-        series.Points.Clear();
+        ClearPoints(series.Points);
         invisibleSeries.Add(series);
       } else {
@@ -572 +572 @@
                             where !invisibleSeries.Contains(s)
                             select new { row = r, series = s }) {
-            h.series.Points.Clear();
+            ClearPoints(h.series.Points);
             CalculateHistogram(h.series, h.row, histograms);
           }
@@ -599 +599 @@
 
     protected virtual void CalculateHistogram(Series series, DataRow row, IEnumerable<DataRow> histogramRows) {
-      series.Points.Clear();
+      ClearPoints(series.Points);
       if (!row.Values.Any()) return;
 
@@ -732 +732 @@
       return double.IsNaN(x) || x < (double)decimal.MinValue || x > (double)decimal.MaxValue;
     }
+
+    // workaround for performance problem as described in https://stackoverflow.com/questions/5744930/datapointcollection-clear-performance
+    public static void ClearPoints(DataPointCollection points) {
+      points.SuspendUpdates();
+      while (points.Count > 0)
+        points.RemoveAt(points.Count - 1);
+      points.ResumeUpdates();
+    }
     #endregion
   }