Changeset 5824 for trunk

Timestamp:

03/24/11 15:46:59 (14 years ago)

Author:

mkommend

Message:

#1413: Corrected jitter in RunCollectionBubbleChartView and adapted default bubble size.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionBubbleChartView.Designer.cs (modified) (1 diff)
• RunCollectionBubbleChartView.cs (modified) (6 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 = 15;
+      this.sizeTrackBar.Value = 10;
       this.sizeTrackBar.ValueChanged += new System.EventHandler(this.sizeTrackBar_ValueChanged);
       // 

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

@@ -239 +239 @@
         }
       }
+      var xAxis = chart.ChartAreas[0].AxisX;
+      var yAxis = chart.ChartAreas[0].AxisY;
+      xTrackBar.Value = 0;
+      yTrackBar.Value = 0;
+      SetAutomaticUpdateOfAxis(xAxis, true);
+      SetAutomaticUpdateOfAxis(yAxis, true);
     }
 
@@ -256 +262 @@
         point.MarkerSize = (int)Math.Round((sizeTrackBar.Value - sizeTrackBar.Minimum) * relativeSize + sizeTrackBar.Minimum);
       }
+    }
+
+    private void UpdateDataPointJitter() {
+      var xAxis = this.chart.ChartAreas[0].AxisX;
+      var yAxis = this.chart.ChartAreas[0].AxisY;
+      SetAutomaticUpdateOfAxis(xAxis, false);
+      SetAutomaticUpdateOfAxis(yAxis, false);
+
+      foreach (DataPoint point in chart.Series[0].Points) {
+        IRun run = (IRun)point.Tag;
+        double xValue = GetValue(run, xAxisValue).Value;
+        double yValue = GetValue(run, yAxisValue).Value;
+
+        if (!xJitterFactor.IsAlmost(0.0))
+          xValue += 0.1 * GetXJitter(run) * xJitterFactor * (xAxis.Maximum - xAxis.Minimum);
+        if (!yJitterFactor.IsAlmost(0.0))
+          yValue += 0.1 * GetYJitter(run) * yJitterFactor * (yAxis.Maximum - yAxis.Minimum);
+
+        point.XValue = xValue;
+        point.YValues[0] = yValue;
+      }
+    }
+
+    private void SetAutomaticUpdateOfAxis(Axis axis, bool enabled) {
+      if (enabled) {
+        axis.Maximum = double.NaN;
+        axis.Minimum = double.NaN;
+        axis.MajorGrid.Interval = double.NaN;
+        axis.MajorTickMark.Interval = double.NaN;
+        axis.LabelStyle.Interval = double.NaN;
+      } else {
+        axis.Minimum = axis.Minimum;
+        axis.Maximum = axis.Maximum;
+        axis.MajorGrid.Interval = axis.MajorGrid.Interval;
+        axis.MajorTickMark.Interval = axis.MajorTickMark.Interval;
+        axis.LabelStyle.Interval = axis.LabelStyle.Interval;
+      }
+
     }
 
@@ -270 +314 @@
       if (xValue.HasValue && yValue.HasValue && sizeValue.HasValue) {
         xValue = xValue.Value;
-        if (!xJitterFactor.IsAlmost(0.0))
-          xValue += 0.1 * GetXJitter(run) * xJitterFactor * (this.chart.ChartAreas[0].AxisX.Maximum - this.chart.ChartAreas[0].AxisX.Minimum);
+
         yValue = yValue.Value;
-        if (!yJitterFactor.IsAlmost(0.0))
-          yValue += 0.1 * GetYJitter(run) * yJitterFactor * (this.chart.ChartAreas[0].AxisY.Maximum - this.chart.ChartAreas[0].AxisY.Minimum);
+
         if (run.Visible) {
           DataPoint point = new DataPoint(xValue.Value, new double[] { yValue.Value, sizeValue.Value });
@@ -280 +322 @@
           point.Color = run.Color;
           series.Points.Add(point);
-
           if (!runToDataPointMapping.ContainsKey(run)) runToDataPointMapping.Add(run, new List<DataPoint>());
           runToDataPointMapping[run].Add(point);
@@ -527 +568 @@
       this.xJitterFactor = xTrackBar.Value / 100.0;
       this.yJitterFactor = yTrackBar.Value / 100.0;
-      this.UpdateDataPoints();
+      UpdateDataPointJitter();
     }
     private void sizeTrackBar_ValueChanged(object sender, EventArgs e) {
@@ -643 +684 @@
     }
     #endregion
+
   }
 }