Add constants class and separate classes into regions

7 files changed, 104 insertions, 1 deletions

diff --git a/grapher/Models/Options/AccelOptions.cs b/grapher/Models/Options/AccelOptions.cs
index 6b98274..224c5cb 100644
--- a/grapher/Models/Options/AccelOptions.cs
+++ b/grapher/Models/Options/AccelOptions.cs
@@ -11,9 +11,15 @@ namespace grapher
 {
     public class AccelOptions
     {
+        #region Constants
+
         public const int PossibleOptionsCount = 4;
         public const int PossibleOptionsXYCount = 2;
 
+        #endregion Constants
+
+        #region Fields
+
         public static readonly Dictionary<string, LayoutBase> AccelerationTypes = new List<LayoutBase>
         {
             new LinearLayout(),
@@ -27,6 +33,10 @@ namespace grapher
             new OffLayout()
         }.ToDictionary(k => k.Name);
 
+        #endregion Fields
+
+        #region Constructors
+
         public AccelOptions(
             ComboBox accelDropdown,
             Option[] options,
@@ -57,6 +67,10 @@ namespace grapher
             Layout("Off");
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public Button WriteButton { get; }
 
         public ComboBox AccelDropdown { get; }
@@ -69,6 +83,10 @@ namespace grapher
 
         public OptionXY[] OptionsXY { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void SetActiveValue(int index)
         {
             var name = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value.Name;
@@ -87,5 +105,7 @@ namespace grapher
             AccelerationIndex = accelerationType.Index;
             accelerationType.Layout(Options, OptionsXY, WriteButton);
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Options/ActiveValueLabel.cs b/grapher/Models/Options/ActiveValueLabel.cs
index 138775a..b2355b5 100644
--- a/grapher/Models/Options/ActiveValueLabel.cs
+++ b/grapher/Models/Options/ActiveValueLabel.cs
@@ -10,12 +10,22 @@ namespace grapher.Models.Options
 {
     public class ActiveValueLabel
     {
+        #region Constants
+
         public const string DefaultFormatString = "0.######";
         public static readonly Color ActiveValueFontColor = Color.FromArgb(255, 65, 65, 65);
 
+        #endregion Constants
+
+        #region Fields
+
         private string _prefix;
         private string _value;
 
+        #endregion Fields
+
+        #region Constructors
+
         public ActiveValueLabel(Label valueLabel, Label centeringLabel)
         {
             ValueLabel = valueLabel;
@@ -29,6 +39,10 @@ namespace grapher.Models.Options
             Prefix = string.Empty;
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public Label ValueLabel { get; }
 
         public string FormatString { get; set; }
@@ -79,6 +93,10 @@ namespace grapher.Models.Options
             }
         }
 
+        #endregion Properties
+
+        #region Methods
+
         public void Hide()
         {
             ValueLabel.Hide();
@@ -103,5 +121,7 @@ namespace grapher.Models.Options
         {
             ValueLabel.Text = string.IsNullOrWhiteSpace(Prefix) ? Value: $"{Prefix}: {Value}";
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Options/ActiveValueLabelXY.cs b/grapher/Models/Options/ActiveValueLabelXY.cs
index 12506e9..553ce48 100644
--- a/grapher/Models/Options/ActiveValueLabelXY.cs
+++ b/grapher/Models/Options/ActiveValueLabelXY.cs
@@ -8,9 +8,15 @@ namespace grapher.Models.Options
 {
     public class ActiveValueLabelXY
     {
+        #region Constants
+
         public const int ActiveLabelXYSeparation = 2;
         public const string ShortenedFormatString = "0.###";
 
+        #endregion Constants
+
+        #region Constructors
+
         public ActiveValueLabelXY(
             ActiveValueLabel x,
             ActiveValueLabel y)
@@ -29,6 +35,10 @@ namespace grapher.Models.Options
             SetCombined();
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public ActiveValueLabel X { get; }
 
         public ActiveValueLabel Y { get; }
@@ -39,6 +49,10 @@ namespace grapher.Models.Options
 
         private int ShortenedWidth { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void SetValues(double x, double y)
         {
             X.SetValue(x);
@@ -80,5 +94,7 @@ namespace grapher.Models.Options
 
             Combined = false;
         }
+
+        #region Methods
     }
 }
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 0c9fd6a..a269b49 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -10,6 +10,8 @@ namespace grapher.Models.Options
 {
     public class ApplyOptions
     {
+        #region Constructors
+
         public ApplyOptions(
             ToolStripMenuItem wholeVectorMenuItem,
             ToolStripMenuItem byComponentMenuItem)
@@ -26,12 +28,19 @@ namespace grapher.Models.Options
             IsWhole = false;
         }
 
+        #endregion Constructors
+
+        #region Properties
         public ToolStripMenuItem WholeVectorMenuItem { get; }
 
         public ToolStripMenuItem ByComponentVectorMenuItem { get; }
 
         public bool IsWhole { get; private set; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void SetActive(bool isWhole)
         {
             WholeVectorMenuItem.Checked = isWhole;
@@ -81,5 +90,6 @@ namespace grapher.Models.Options
             IsWhole = false;
         }
 
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 3bdf3c6..9d903ec 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -10,9 +10,14 @@ namespace grapher
 {
     public class CapOptions
     {
+        #region Constants
 
         public const string GainCapFormatString = "0.##";
 
+        #endregion Constants
+
+        #region Constructors
+
         public CapOptions(
             ToolStripMenuItem sensitivityCapCheck,
             ToolStripMenuItem velocityGainCapCheck,
@@ -34,6 +39,10 @@ namespace grapher
             EnableSensitivityCap();
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public ToolStripMenuItem SensitivityCapCheck { get; }
 
         public ToolStripMenuItem VelocityGainCapCheck { get; }
@@ -42,6 +51,8 @@ namespace grapher
 
         public OptionXY WeightOption { get; }
 
+        public bool IsSensitivityGain { get; private set; }
+
         public double SensitivityCapX { 
             get
             {
@@ -84,7 +95,9 @@ namespace grapher
             }
         }
 
-        public bool IsSensitivityGain { get; private set; }
+        #endregion Properties
+
+        #region Methods
 
         public void SetActiveValues(double gainCap, double sensCapX, double sensCapY, bool capGainEnabled)
         {
@@ -157,5 +170,7 @@ namespace grapher
             WeightOption.Fields.LockCheckBox.Enabled = false;
             CapOption.SetName("Velocity Gain Cap");
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs
index b0ef374..c5336a6 100644
--- a/grapher/Models/Options/Option.cs
+++ b/grapher/Models/Options/Option.cs
@@ -10,6 +10,8 @@ namespace grapher
 {
     public class Option
     {
+        #region Constructors
+
         public Option(
             Field field,
             Label label,
@@ -50,12 +52,20 @@ namespace grapher
             SetName(startingName);
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public Field Field { get; }
 
         public Label Label { get; }
 
         public ActiveValueLabel ActiveValueLabel { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void SetName(string name)
         {
             Label.Text = name;
@@ -93,5 +103,7 @@ namespace grapher
 
             Show();
         }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index b026c8a..c1fd0b7 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -10,6 +10,7 @@ namespace grapher
 {
     public class OptionXY
     {
+        #region Constructors
         public OptionXY(FieldXY fields, Label label, ActiveValueLabelXY activeValueLabels)
         {
             Fields = fields;
@@ -50,12 +51,20 @@ namespace grapher
             SetName(startingName);
         }
 
+        #endregion Constructors
+
+        #region Properties
+
         public FieldXY Fields { get; }
 
         public Label Label { get; }
 
         public ActiveValueLabelXY ActiveValueLabels { get; }
 
+        #endregion Properties
+
+        #region Methods
+
         public void SetName(string name)
         {
             Label.Text = name;
@@ -89,5 +98,6 @@ namespace grapher
             Show();
         }
 
+        #endregion Methods
     }
 }