Changeset 8832 for trunk

Timestamp:

10/22/12 18:53:05 (12 years ago)

Author:

gkronber

Message:

#1918 suggested fix for strange method SetAutomaticUpdateOfAxis(). Exception is gone but don't know if originally intended functionality is still intact.

File:

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

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

@@ -263 +263 @@
       xTrackBar.Value = 0;
       yTrackBar.Value = 0;
-      SetAutomaticUpdateOfAxis(xAxis, true);
-      SetAutomaticUpdateOfAxis(yAxis, true);
     }
 
@@ -284 +282 @@
     }
 
+
+    private class AxisParameters {
+      public double min, max, majorGridInterval, majorTickMarkInterval, labelStyleInterval;
+    }
     private void UpdateDataPointJitter() {
       var xAxis = this.chart.ChartAreas[0].AxisX;
       var yAxis = this.chart.ChartAreas[0].AxisY;
-      SetAutomaticUpdateOfAxis(xAxis, false);
-      SetAutomaticUpdateOfAxis(yAxis, false);
+
+
+      // disable automatic update of axis
+      var disabledParameters = new AxisParameters();
+      disabledParameters.min = disabledParameters.max = disabledParameters.majorGridInterval = disabledParameters.majorTickMarkInterval = disabledParameters.labelStyleInterval = double.NaN;
+
+      AxisParameters savedXParameters, savedYParameters;
+      savedXParameters = SetAxisParameters(xAxis, disabledParameters);
+      savedYParameters = SetAxisParameters(yAxis, disabledParameters);
 
       foreach (DataPoint point in chart.Series[0].Points) {
@@ -296 +305 @@
 
         if (!xJitterFactor.IsAlmost(0.0))
-          xValue += 0.1 * GetXJitter(run) * xJitterFactor * (xAxis.Maximum - xAxis.Minimum);
+          xValue += 0.1 * GetXJitter(run) * xJitterFactor * (savedXParameters.max - savedXParameters.min);
         if (!yJitterFactor.IsAlmost(0.0))
-          yValue += 0.1 * GetYJitter(run) * yJitterFactor * (yAxis.Maximum - yAxis.Minimum);
+          yValue += 0.1 * GetYJitter(run) * yJitterFactor * (savedYParameters.max - savedYParameters.min);
 
         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;
-      }
-
+      SetAxisParameters(xAxis, savedXParameters);
+      SetAxisParameters(yAxis, savedYParameters);
+    }
+
+    private AxisParameters SetAxisParameters(Axis axis, AxisParameters @new) {
+      var old = new AxisParameters();
+      old.min = axis.Minimum;
+      old.max = axis.Maximum;
+      old.majorGridInterval = axis.MajorGrid.Interval;
+      old.majorTickMarkInterval = axis.MajorTickMark.Interval;
+      old.labelStyleInterval = axis.LabelStyle.Interval;
+
+      axis.Maximum = @new.max;
+      axis.Minimum = @new.min;
+      axis.MajorGrid.Interval = @new.majorGridInterval;
+      axis.MajorTickMark.Interval = @new.majorTickMarkInterval;
+      axis.LabelStyle.Interval = @new.labelStyleInterval;
+      return old;
     }