Changeset 3543 for trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

Timestamp:

04/27/10 13:33:41 (14 years ago)

Author:

mkommend

Message:

updated RunCollectionBubbleChart (ticket #970)

File:

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

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

@@ -63 +63 @@
       this.isSelecting = false;
 
+      
       this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
       this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
-      this.chart.ChartAreas[0].AxisX.ScaleView.Zoomable = !this.isSelecting;
-      this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = !this.isSelecting;
       this.chart.ChartAreas[0].CursorX.Interval = 0;
       this.chart.ChartAreas[0].CursorY.Interval = 0;
-
+      this.chart.ChartAreas[0].AxisX.ScaleView.Zoomable = !this.isSelecting;
+      this.chart.ChartAreas[0].AxisX.IntervalAutoMode = IntervalAutoMode.VariableCount;
+      this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = !this.isSelecting;
+      this.chart.ChartAreas[0].AxisY.IntervalAutoMode = IntervalAutoMode.VariableCount;
     }
 
@@ -179 +181 @@
         foreach (IRun run in this.Content)
           this.AddDataPoint(run);
-        //Thread.Sleep(100);
+
+        //check to correct max bubble size
+        if (this.chart.Series[0].Points.Select(p => p.YValues[1]).Distinct().Count() == 1)
+          this.chart.Series[0]["BubbleMaxSize"] = "2";
+        else
+          this.chart.Series[0]["BubbleMaxSize"] = "7";
+
+        if (this.chart.Series[0].Points.Count == 0)
+          noRunsLabel.Visible = true;
+        else
+          noRunsLabel.Visible = false;
       }
     }
@@ -190 +202 @@
       xValue = GetValue(run, (string)xAxisComboBox.SelectedItem);
       yValue = GetValue(run, (string)yAxisComboBox.SelectedItem);
-      if (xValue.HasValue && yValue.HasValue) {
-       sizeValue = GetValue(run, (string)sizeComboBox.SelectedItem);
-        xValue = xValue.Value + xValue.Value * GetXJitter(Content.ElementAt(row)) * xJitterFactor;
-        yValue = yValue.Value + yValue.Value * GetYJitter(Content.ElementAt(row)) * yJitterFactor;
+      sizeValue = GetValue(run, (string)sizeComboBox.SelectedItem);
+      if (xValue.HasValue && yValue.HasValue && sizeValue.HasValue) {
+        xValue = xValue.Value + xValue.Value * GetXJitter(run) * xJitterFactor;
+        yValue = yValue.Value + yValue.Value * GetYJitter(run) * yJitterFactor;
         if (run.Visible) {
           DataPoint point = new DataPoint(xValue.Value, new double[] { yValue.Value, sizeValue.Value });
@@ -220 +232 @@
         DoubleValue doubleValue = value as DoubleValue;
         IntValue intValue = value as IntValue;
-        double ret;
-        if (doubleValue != null)
-          ret = doubleValue.Value;
-        else if (intValue != null)
+        double? ret = null;
+        if (doubleValue != null) {
+          if (!double.IsNaN(doubleValue.Value) && !double.IsInfinity(doubleValue.Value))
+            ret = doubleValue.Value;
+        } else if (intValue != null)
           ret = intValue.Value;
         else
@@ -409 +422 @@
         foreach (var pair in categoricalMapping[dimension]) {
           string labelText = pair.Key.ToString();
-          if(labelText.Length > 25)
-            labelText = labelText.Substring(0,25) + " ... ";
+          if (labelText.Length > 25)
+            labelText = labelText.Substring(0, 25) + " ... ";
           label = axis.CustomLabels.Add(pair.Value - 0.5, pair.Value + 0.5, labelText);
           label.GridTicks = GridTickTypes.TickMark;
@@ -442 +455 @@
     }
     #endregion
-
-    private void sizeLabel_Click(object sender, EventArgs e) {
-
-    }
   }
 }