Merge pull request #46 from a1xd/1.3

1 files changed, 13 insertions, 7 deletions

diff --git a/grapher/Models/Fields/Field.cs b/grapher/Models/Fields/Field.cs
index 541bbe2..345f814 100644
--- a/grapher/Models/Fields/Field.cs
+++ b/grapher/Models/Fields/Field.cs
@@ -27,12 +27,16 @@ namespace grapher
 
         #region Constructors
 
-        public Field(TextBox box, Form containingForm, double defaultData)
+        public Field(TextBox box, Form containingForm, double defaultData, 
+                                                       double minData = double.MinValue, 
+                                                       double maxData = double.MaxValue)
         {
             DefaultText = DecimalString(defaultData);
             Box = box;
             _data = defaultData;
             DefaultData = defaultData;
+            MinData = minData;
+            MaxData = maxData;
             State = FieldState.Undefined;
             ContainingForm = containingForm;
             FormatString = Constants.DefaultFieldFormatString;
@@ -69,7 +73,7 @@ namespace grapher
                 {
                     return DefaultData;
                 }
-            } 
+            }
         }
 
         public int Top
@@ -122,6 +126,10 @@ namespace grapher
 
         private double DefaultData { get; set; }
 
+        private double MinData { get; }
+
+        private double MaxData { get; }
+
         #endregion Properties
 
         #region Methods
@@ -268,12 +276,10 @@ namespace grapher
 
         private void TextToData()
         {
-            try
-            {
-                _data = Convert.ToDouble(Box.Text);
-            }
-            catch
+            if (double.TryParse(Box.Text, out double value) && 
+                value <= MaxData && value >= MinData)
             {
+                _data = value;
             }
 
             Box.Text = DecimalString(Data);