Merge pull request #46 from a1xd/1.3

6 files changed, 24 insertions, 19 deletions

diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index 6247811..b7abb35 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -99,7 +99,7 @@ namespace grapher
 
         #region Methods
 
-        public void MakeDots(int x, int y, double timeInMs)
+        public void MakeDots(double x, double y, double timeInMs)
         {
             ChartState.MakeDots(x, y, timeInMs);
         }
diff --git a/grapher/Models/Charts/ChartState/ChartState.cs b/grapher/Models/Charts/ChartState/ChartState.cs
index 270e212..0bb141e 100644
--- a/grapher/Models/Charts/ChartState/ChartState.cs
+++ b/grapher/Models/Charts/ChartState/ChartState.cs
@@ -40,7 +40,7 @@ namespace grapher.Models.Charts.ChartState
 
         internal bool TwoDotsPerGraph { get; set; }
 
-        public abstract void MakeDots(int x, int y, double timeInMs);
+        public abstract void MakeDots(double x, double y, double timeInMs);
 
         public abstract void Bind();
 
diff --git a/grapher/Models/Charts/ChartState/CombinedState.cs b/grapher/Models/Charts/ChartState/CombinedState.cs
index aab8a38..9eadb87 100644
--- a/grapher/Models/Charts/ChartState/CombinedState.cs
+++ b/grapher/Models/Charts/ChartState/CombinedState.cs
@@ -30,7 +30,7 @@ namespace grapher.Models.Charts.ChartState
             GainChart.ClearSecondDots();
         }
 
-        public override void MakeDots(int x, int y, double timeInMs)
+        public override void MakeDots(double x, double y, double timeInMs)
         {
             Data.CalculateDots(x, y, timeInMs);
         }
diff --git a/grapher/Models/Charts/ChartState/XYOneGraphState.cs b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
index 92c799f..2b3cd9c 100644
--- a/grapher/Models/Charts/ChartState/XYOneGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
@@ -28,7 +28,7 @@ namespace grapher.Models.Charts.ChartState
             GainChart.SetCombined();
         }
 
-        public override void MakeDots(int x, int y, double timeInMs)
+        public override void MakeDots(double x, double y, double timeInMs)
         {
             Data.CalculateDotsCombinedDiffSens(x, y, timeInMs, Settings);
         }
diff --git a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
index d107f87..732ea3c 100644
--- a/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYTwoGraphState.cs
@@ -33,7 +33,7 @@ namespace grapher.Models.Charts.ChartState
             GainChart.ClearSecondDots();
         }
 
-        public override void MakeDots(int x, int y, double timeInMs)
+        public override void MakeDots(double x, double y, double timeInMs)
         {
             Data.CalculateDotsXY(x, y, timeInMs);
         }
diff --git a/grapher/Models/Charts/ChartXY.cs b/grapher/Models/Charts/ChartXY.cs
index 98ba059..553ab3e 100644
--- a/grapher/Models/Charts/ChartXY.cs
+++ b/grapher/Models/Charts/ChartXY.cs
@@ -1,4 +1,5 @@
 using grapher.Models.Mouse;
+using System;
 using System.Collections;
 using System.Windows.Forms.DataVisualization.Charting;
 
@@ -29,6 +30,8 @@ namespace grapher
 
         #endregion Constructors
 
+        private const double VerticalMargin = 0.1;
+
         #region Properties
 
         public Chart ChartX { get; }
@@ -219,28 +222,30 @@ namespace grapher
             ChartX.Series[2].IsVisibleInLegend = true;
         }
 
-        public void SetMinMax(double min, double max)
+        private void VerifyRange(double min, double max)
         {
-            if (min < max)
+            if (min > max)
             {
-                ChartX.ChartAreas[0].AxisY.Minimum = min * 0.95;
-                ChartX.ChartAreas[0].AxisY.Maximum = max * 1.05;
+                throw new ArgumentException($"invalid chart range: ({min}, {max})");
             }
         }
 
+        public void SetMinMax(double min, double max)
+        {
+            VerifyRange(min, max);
+            ChartX.ChartAreas[0].AxisY.Minimum = min * (1 - VerticalMargin);
+            ChartX.ChartAreas[0].AxisY.Maximum = max * (1 + VerticalMargin);
+        }
+
         public void SetMinMaxXY(double minX, double maxX, double minY, double maxY)
         {
-            if (minX < maxX)
-            {
-                ChartX.ChartAreas[0].AxisY.Minimum = minX * 0.95;
-                ChartX.ChartAreas[0].AxisY.Maximum = maxX  * 1.05;
-            }
+            VerifyRange(minX, maxX);
+            ChartX.ChartAreas[0].AxisY.Minimum = minX * (1 - VerticalMargin);
+            ChartX.ChartAreas[0].AxisY.Maximum = maxX * (1 + VerticalMargin);
 
-            if (minY < maxY)
-            {
-                ChartY.ChartAreas[0].AxisY.Minimum = minY  * 0.95;
-                ChartY.ChartAreas[0].AxisY.Maximum = maxY * 1.05;
-            }
+            VerifyRange(minY, maxY);
+            ChartX.ChartAreas[0].AxisY.Minimum = minY * (1 - VerticalMargin);
+            ChartX.ChartAreas[0].AxisY.Maximum = maxY * (1 + VerticalMargin);
         }
 
         public void SetCombined()