Changeset 14953

Timestamp:

05/10/17 14:23:23 (8 years ago)

Author:

pfleck

Message:

#2709 Disposed dynamically created controls.

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (6 diffs)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

@@ -85 +85 @@
         groupingComboBox.SelectedItem = Content.GroupingVariable;
 
-        GenerateCharts();
+        GenerateCharts(true);
       }
     }
@@ -239 +239 @@
 
       // clear caches
+      columnHeaderCache[name].Dispose();
       columnHeaderCache.Remove(name);
+      rowHeaderCache[name].Dispose();
       rowHeaderCache.Remove(name);
       var keys = bodyCache.Keys.Where(t => t.Item1 == name || t.Item2 == name).ToList();
-      foreach (var key in keys)
+      foreach (var key in keys) {
+        bodyCache[key].Dispose();
         bodyCache.Remove(key);
+      }
 
       if (IsVariableChecked(name)) {
@@ -255 +259 @@
     }
     protected override void ResetAllVariables() {
-      GenerateCharts();
+      GenerateCharts(true);
     }
     #endregion
@@ -331 +335 @@
 
     protected override void CheckedChangedUpdate() {
-      GenerateCharts();
+      GenerateCharts(false); // only checked-changes -> reuse cached values
     }
 
     #region Generate Charts
-    private void GenerateCharts() {
+    private void GenerateCharts(bool clearCache) {
       if (suppressCheckedChangedUpdate) return;
 
@@ -346 +350 @@
         tableLayoutPanel.RowStyles.Clear();
       }
-      columnHeaderCache.Clear();
-      rowHeaderCache.Clear();
-      bodyCache.Clear();
+
+      if (clearCache) {
+        foreach (var control in bodyCache.Values
+          .Concat(columnHeaderCache.Values)
+          .Concat(rowHeaderCache.Values)) {
+          control.Dispose();
+        }
+        columnHeaderCache.Clear();
+        rowHeaderCache.Clear();
+        bodyCache.Clear();
+      }
 
       // Set row and column count
@@ -542 +554 @@
 
     private void groupingComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      GenerateCharts();
+      GenerateCharts(true); // new series within charts -> clear cache
     }
   }