Changeset 12499

Timestamp:

06/23/15 16:02:53 (9 years ago)

Author:

pfleck

Message:

#2379

• Quick-fixed a critical performance bug when changing the checked status of many items in the tree (e.g. via level change)
• Added a new sample with alps runs.

Location:

branches/BubbleChart

Files:

• HeuristicLab.Optimization.BubbleChart/3.3/BubbleChartView.cs (modified) (6 diffs)
• Samples/alps runs.hl (added)

branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/BubbleChartView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -31 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimization.BubbleChart {
@@ -46 +44 @@
     private string YAxisValue { get { return (string)yAxisComboBox.SelectedItem; } }
     private string SizeAxisValue { get { return (string)sizeComboBox.SelectedItem; } }
+
+    private bool updating = false;
 
     public new RecursiveDataItem Content {
@@ -304 +304 @@
       }
     }
-
-    private void UpdateNodeColors() {
-      var selectedDepth = treeView.SelectedNode != null ? treeView.SelectedNode.Level : (int?)null;
-      var selectedIndex = treeView.SelectedNode != null ? treeView.SelectedNode.Index : (int?)null;
-      foreach (TreeNode node in treeView.Nodes) {
-        UpdateNodeColor(node, selectedDepth, selectedIndex);
-      }
-    }
-    private void UpdateNodeColor(TreeNode node, int? depth, int? index) {
-      if (depth.HasValue && index.HasValue && node.Level == depth /*&& node.Index == index*/)
-        node.BackColor = Color.Yellow;
-      else
-        node.BackColor = Color.White;
-      foreach (TreeNode child in node.Nodes)
-        UpdateNodeColor(child, depth, index);
-    }
     #endregion
 
     #region Event Handlers
     private void treeView_AfterCheck(object sender, TreeViewEventArgs e) {
+      if (updating) return;
+      updating = true;
       UpdateComboBoxes();
       UpdateDataPoints();
+      updating = false;
     }
     private void treeView_AfterSelect(object sender, TreeViewEventArgs e) {
@@ -334 +321 @@
 
     private void axisComboBox_SelectedValueChanged(object sender, EventArgs e) {
+      if (updating) return;
+      updating = true;
       UpdateDataPoints();
       UpdateAxisLabels();
+      updating = false;
     }
 
     private void includeChildrenCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (updating) return;
+      updating = true;
       UpdateTreeViewCheckBoxes();
       UpdateComboBoxes();
+      updating = false;
     }
 
     private void levelNumericUpDown_ValueChanged(object sender, EventArgs e) {
+      if (updating) return;
+      updating = true;
       UpdateTreeViewCheckBoxes();
       UpdateComboBoxes();
+      updating = false;
     }
     #endregion
@@ -363 +359 @@
       }
     }
-
-    private void BeginUpdateComboBoxes() {
-      xAxisComboBox.BeginUpdate();
-      yAxisComboBox.BeginUpdate();
-      sizeComboBox.BeginUpdate();
-    }
-    private void EndUpdateComboBoxes() {
-      xAxisComboBox.EndUpdate();
-      yAxisComboBox.EndUpdate();
-      sizeComboBox.EndUpdate();
-    }
     #endregion
   }