Respect MinimumRange values when Minimum and Maximum values are also set

Resolves oxyplot#550.
eixie · Oct 19, 2015 · 1161d2d · 1161d2d
1 parent 62b6318
commit 1161d2d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -104,6 +104,7 @@ All notable changes to this project will be documented in this file.
 - Fix null reference exception when ActualPoints was null rendering a StairStepSeries (#582)
 - Background color in the Xamarin.Forms views (#546)
 - IsVisible change in Xamarin.Forms.Platform.iOS (#546)
+- Fix issue with MinimumRange not taking Minimum and Maximum values into account (#550)
 
 ## [2014.1.546] - 2014-10-22
 ### Added

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -20,6 +20,7 @@ Brannon King
 Brian Lim <[email protected]>
 Caleb Clarke <[email protected]>
 Carlos Teixeira <[email protected]>
+classicboss302
 Cyril Martin <[email protected]>
 darrelbrown
 David Laundav <[email protected]>

diff --git a/Source/Examples/ExampleLibrary/Axes/AxisExamples.cs b/Source/Examples/ExampleLibrary/Axes/AxisExamples.cs
@@ -516,6 +516,21 @@ public static PlotModel AbsoluteMinimumAndMaximum()
             return model;
         }
 
+        [Example("MinimumRange with Minimum")]
+        public static PlotModel MinimumRangeWithMinimum()
+        {
+            var model = new PlotModel { Title = "MinimumRange of 5 with a Minimum of 0", Subtitle = "Should show a range from 0 to 5" };
+            model.Axes.Add(
+                new LinearAxis
+                {
+                    Position = AxisPosition.Left,
+                    Minimum = 0,
+                    MinimumRange = 5
+                });
+
+            return model;
+        }
+
         [Example("Title with unit")]
         public static PlotModel TitleWithUnit()
         {

diff --git a/Source/Examples/WPF/WpfExamples/WpfExamples.csproj b/Source/Examples/WPF/WpfExamples/WpfExamples.csproj
@@ -503,5 +503,4 @@
     <Folder Include="Workitems\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
-
+</Project>
diff --git a/Source/OxyPlot/Axes/Axis.cs b/Source/OxyPlot/Axes/Axis.cs
@@ -722,10 +722,21 @@ public virtual void CoerceActualMaxMin()
             var range = this.ActualMaximum - this.ActualMinimum;
             if (range < this.MinimumRange)
             {
-                var average = (this.ActualMaximum + this.ActualMinimum) * 0.5;
-                var delta = this.MinimumRange / 2;
-                this.ActualMinimum = average - delta;
-                this.ActualMaximum = average + delta;
+                if (!double.IsNaN(this.Minimum) && !double.IsNaN(this.Maximum))
+                {
+                    var average = (this.ActualMaximum + this.ActualMinimum) * 0.5;
+                    var delta = this.MinimumRange / 2;
+                    this.ActualMinimum = average - delta;
+                    this.ActualMaximum = average + delta;
+                }
+                else if (!double.IsNaN(this.Minimum) && double.IsNaN(this.Maximum))
+                {
+                    this.ActualMaximum = this.Minimum + this.MinimumRange;
+                }
+                else if (!double.IsNaN(this.Maximum) && double.IsNaN(this.Minimum))
+                {
+                    this.ActualMinimum = this.Maximum - this.MinimumRange;
+                }
             }
 
             if (this.AbsoluteMaximum <= this.AbsoluteMinimum)