Changeset 3726 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

05/09/10 00:46:40 (14 years ago)

Author:

mkommend

Message:

corrected behavior of RunCollectionBubbleChart (ticket #970)

File:

• trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -43 +43 @@
     private enum AxisDimension { Index = 0 }
 
+    private string xAxisValue;
+    private string yAxisValue;
+    private string sizeAxisValue;
+
     private Dictionary<int, Dictionary<object, double>> categoricalMapping;
     private Dictionary<IRun, double> xJitter;
@@ -227 +231 @@
       Series series = this.chart.Series[0];
       int row = this.Content.ToList().IndexOf(run);
-      xValue = GetValue(run, (string)xAxisComboBox.SelectedItem);
-      yValue = GetValue(run, (string)yAxisComboBox.SelectedItem);
-      sizeValue = GetValue(run, (string)sizeComboBox.SelectedItem);
+
+      if (!xAxisComboBox.DroppedDown)
+        this.xAxisValue = (string)xAxisComboBox.SelectedItem;
+      if (!yAxisComboBox.DroppedDown)
+        this.yAxisValue = (string)yAxisComboBox.SelectedItem;
+      if (!sizeComboBox.DroppedDown)
+        this.sizeAxisValue = (string)sizeComboBox.SelectedItem;
+
+      xValue = GetValue(run, this.xAxisValue);
+      yValue = GetValue(run, this.yAxisValue);
+      sizeValue = GetValue(run, this.sizeAxisValue);
+
       if (xValue.HasValue && yValue.HasValue && sizeValue.HasValue) {
         xValue = xValue.Value;