Changeset 12598

Timestamp:

07/06/15 13:42:53 (9 years ago)

Author:

pfleck

Message:

#2379 Implemented sizing of markers.

File:

• branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/BubbleChartView.cs (modified) (3 diffs)

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

@@ -56 +56 @@
     public BubbleChartView() {
       InitializeComponent();
+
+      chart.CustomizeAllChartAreas();
+      chart.ChartAreas[0].CursorX.Interval = 1;
+      chart.ChartAreas[0].CursorY.Interval = 1;
+      chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
     }
 
@@ -190 +196 @@
           var ys = GetValues(item, YAxisValue).ToList();
           var ss = GetValues(item, SizeAxisValue).ToList();
-          if (xs.Count > 0 && ys.Count > 0 && ss.Count == 1) {
-            var s = ss[0];
+          if (xs.Count > 0 && ys.Count > 0 && (ss.Count == 1 || ss.Count == xs.Count || ss.Count == ys.Count)) {
+            var sEnum = ss.Count > 1 ? ss.GetEnumerator() : Enumerable.Repeat(ss[0], xs.Count * ys.Count).GetEnumerator();
+            sEnum.MoveNext();
             if (xs.Count > 1 && ys.Count > 1) { // index matching
               for (int i = 0; i < Math.Min(xs.Count, ys.Count); i++)
-                series.Points.Add(new DataPoint(xs[i], new[] { ys[i], s }));
+                series.Points.Add(new DataPoint(xs[i], new[] { ys[i], sEnum.Current }));
             } else {
-              foreach (var x in xs)
-                foreach (var y in ys)
-                  series.Points.Add(new DataPoint(x, new[] { y, s }));
+              foreach (var x in xs) {
+                foreach (var y in ys) {
+                  series.Points.Add(new DataPoint(x, new[] { y, sEnum.Current }));
+                  sEnum.MoveNext();
+                }
+              }
             }
           }
         }
+        UpdateMarkerSizes();
       }
     }
@@ -349 +360 @@
       }
     }
+
+    private void UpdateMarkerSizes() {
+      var series = chart.Series[0];
+      if (series.Points.Count <= 0) return;
+
+      var sizeValues = series.Points.Select(p => p.YValues[1]);
+      double minSizeValue = sizeValues.Min();
+      double maxSizeValue = sizeValues.Max();
+      double sizeRange = maxSizeValue - minSizeValue;
+
+      const int smallestBubbleSize = 7;
+
+      foreach (DataPoint point in series.Points) {
+        //calculates the relative size of the data point  0 <= relativeSize <= 1
+        double relativeSize = (point.YValues[1] - minSizeValue);
+        if (sizeRange > double.Epsilon) {
+          relativeSize /= sizeRange;
+
+          //invert bubble sizes if the value of the trackbar is negative
+          //if (sizeTrackBar.Value < 0) relativeSize = Math.Abs(relativeSize - 1);
+        } else relativeSize = 1;
+
+        double sizeChange = /*Math.Abs(sizeTrackBar.Value)*/ 10 * relativeSize;
+        //double sizeChange = 0;
+        point.MarkerSize = (int)Math.Round(sizeChange + smallestBubbleSize);
+      }
+    }
     #endregion