Changeset 5348 for trunk

Timestamp:

01/21/11 12:59:21 (14 years ago)

Author:

mkommend

Message:

Added functionality to resize bubbles although the size combobox is set to constant (ticket #1056).

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionBubbleChartView.Designer.cs (modified) (1 diff)
• RunCollectionBubbleChartView.cs (modified) (2 diffs)

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

@@ -315 +315 @@
       this.sizeTrackBar.TabIndex = 24;
       this.sizeTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
-      this.sizeTrackBar.Value = 50;
+      this.sizeTrackBar.Value = 15;
       this.sizeTrackBar.ValueChanged += new System.EventHandler(this.sizeTrackBar_ValueChanged);
       // 

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

@@ -231 +231 @@
           this.AddDataPoint(run);
 
-        ////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;
@@ -252 +246 @@
       double maxSizeValue = sizeValues.Max();
 
-      if (maxSizeValue - minSizeValue < double.Epsilon) return;
-
       for (int i = 0; i < sizeValues.Length; i++) {
         DataPoint point = this.chart.Series[0].Points[i];
-        double relativeSize = (point.YValues[1] - minSizeValue) / (maxSizeValue - minSizeValue);
+        double sizeRange = maxSizeValue - minSizeValue;
+        double relativeSize = (point.YValues[1] - minSizeValue);
+
+        if (sizeRange > double.Epsilon) relativeSize /= sizeRange;
+        else relativeSize = 1;
+
         point.MarkerSize = (int)Math.Round((sizeTrackBar.Value - sizeTrackBar.Minimum) * relativeSize + sizeTrackBar.Minimum);
       }
-
     }