Changeset 14006 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

Timestamp:

07/05/16 22:43:11 (8 years ago)

Author:

bburlacu

Message:

#2597: Fixed a couple of bugs in the GradientChart related to the configuration of axis limits.

File:

• branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs (modified) (4 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

@@ -82 +82 @@
         if ((value.HasValue && fixedXAxisMin.HasValue && !value.Value.IsAlmost(fixedXAxisMin.Value)) || (value.HasValue != fixedXAxisMin.HasValue)) {
           fixedXAxisMin = value;
-          SetupAxis(chart.ChartAreas[0].AxisX, trainingMin, trainingMax, XAxisTicks, FixedXAxisMin, FixedXAxisMax);
-          RecalculateInternalDataset();
+          if (trainingMin < trainingMax) {
+            SetupAxis(chart.ChartAreas[0].AxisX, trainingMin, trainingMax, XAxisTicks, FixedXAxisMin, FixedXAxisMax);
+            RecalculateInternalDataset();
+            // set the vertical line position 
+            if (VerticalLineAnnotation.X <= fixedXAxisMin) {
+              var axisX = chart.ChartAreas[0].AxisX;
+              var step = (axisX.Maximum - axisX.Minimum) / drawingSteps;
+              VerticalLineAnnotation.X = axisX.Minimum + step;
+            }
+          }
         }
       }
@@ -93 +101 @@
         if ((value.HasValue && fixedXAxisMax.HasValue && !value.Value.IsAlmost(fixedXAxisMax.Value)) || (value.HasValue != fixedXAxisMax.HasValue)) {
           fixedXAxisMax = value;
-          SetupAxis(chart.ChartAreas[0].AxisX, trainingMin, trainingMax, XAxisTicks, FixedXAxisMin, FixedXAxisMax);
-          RecalculateInternalDataset();
+          if (trainingMin < trainingMax) {
+            SetupAxis(chart.ChartAreas[0].AxisX, trainingMin, trainingMax, XAxisTicks, FixedXAxisMin, FixedXAxisMax);
+            RecalculateInternalDataset();
+            // set the vertical line position 
+            if (VerticalLineAnnotation.X >= fixedXAxisMax) {
+              var axisX = chart.ChartAreas[0].AxisX;
+              var step = (axisX.Maximum - axisX.Minimum) / drawingSteps;
+              VerticalLineAnnotation.X = axisX.Maximum - step;
+            }
+          }
         }
       }
@@ -267 +283 @@
       var minimum = chart.ChartAreas[0].AxisX.Minimum;
       var maximum = chart.ChartAreas[0].AxisX.Maximum;
-      if (defaultValue.IsAlmost(minimum))
+      if (defaultValue <= minimum)
         VerticalLineAnnotation.X = minimum + step;
-      else if (defaultValue.IsAlmost(maximum))
+      else if (defaultValue >= maximum)
         VerticalLineAnnotation.X = maximum - step;
       else
@@ -536 +552 @@
 
       lowerStripLine.IntervalOffset = axisX.Minimum;
-      lowerStripLine.StripWidth = trainingMin - axisX.Minimum;
+      lowerStripLine.StripWidth = Math.Abs(trainingMin - axisX.Minimum);
 
       upperStripLine.IntervalOffset = trainingMax;
-      upperStripLine.StripWidth = axisX.Maximum - trainingMax;
+      upperStripLine.StripWidth = Math.Abs(axisX.Maximum - trainingMax);
     }