Some reorganizing

3 files changed, 55 insertions, 35 deletions

diff --git a/grapher/Models/Options/Cap/CapOptions.cs b/grapher/Models/Options/Cap/CapOptions.cs
index 144cd79..2fe44b0 100644
--- a/grapher/Models/Options/Cap/CapOptions.cs
+++ b/grapher/Models/Options/Cap/CapOptions.cs
@@ -4,34 +4,26 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using static grapher.Models.Options.Cap.CapTypeOptions;
 
 namespace grapher.Models.Options.Cap
 {
     public class CapOptions : OptionBase
     {
-        public enum CapType
-        {
-            In,
-            Out,
-            Both,
-        }
 
         public CapOptions(
-            ComboBox capTypeDropDown,
+            CapTypeOptions capTypeOptions,
             Option capIn,
             Option capOut,
             Option slope)
         {
-            CapTypeDropdown = capTypeDropDown;
+            CapTypeOptions = capTypeOptions;
             In = capIn;
             Out = capOut;
             Slope = slope;
-
-            SetupCapTypeDropdown(CapTypeDropdown);
-            CapTypeDropdown.SelectedItem = CapType.In;
         }
 
-        public ComboBox CapTypeDropdown { get; }
+        public CapTypeOptions CapTypeOptions { get; }
 
         public Option In { get; }
 
@@ -39,8 +31,6 @@ namespace grapher.Models.Options.Cap
 
         public Option Slope { get; }
 
-        public CapType SelectedCapType { get; private set; }
-
         public override int Left
         {
             get => In.Left;
@@ -55,26 +45,26 @@ namespace grapher.Models.Options.Cap
 
         public override int Top
         {
-            get => CapTypeDropdown.Top;
+            get => CapTypeOptions.Top;
             set
             {
-                CapTypeDropdown.Top = value;
+                CapTypeOptions.Top = value;
                 Layout();
             }
         }
 
         public override int Height
         {
-            get => BottomElement.Top + BottomElement.Height - CapTypeDropdown.Top;
+            get => BottomElement.Top + BottomElement.Height - CapTypeOptions.Top;
         }
 
         public override int Width
         {
-            get => CapTypeDropdown.Width;
+            get => CapTypeOptions.Width;
 
             set
             {
-                CapTypeDropdown.Width = value;
+                CapTypeOptions.Width = value;
                 In.Width = value;
                 Out.Width = value;
                 Slope.Width = value;
@@ -83,21 +73,21 @@ namespace grapher.Models.Options.Cap
 
         public override bool Visible
         {
-            get => CapTypeDropdown.Visible;
+            get => CapTypeOptions.Visible;
         }
 
         private Option BottomElement { get; set; }
 
         public void Layout()
         {
-            Layout(CapTypeDropdown.Top + CapTypeDropdown.Height + Constants.OptionVerticalSeperation);
+            Layout(CapTypeOptions.Top + CapTypeOptions.Height + Constants.OptionVerticalSeperation);
         }
 
         private void Layout(int top)
         {
-            switch (SelectedCapType)
+            switch (CapTypeOptions.SelectedCapType)
             {
-                case CapType.In:
+                case CapType.Input:
                     Slope.Show();
                     In.Show();
                     Out.Hide();
@@ -106,7 +96,7 @@ namespace grapher.Models.Options.Cap
                     In.SnapTo(Slope);
                     BottomElement = In;
                     break;
-                case CapType.Out:
+                case CapType.Output:
                     Slope.Show();
                     In.Hide();
                     Out.Show();
@@ -127,14 +117,8 @@ namespace grapher.Models.Options.Cap
             }
         }
 
-        private void FindSelectedTypeFromDropdown()
-        {
-            SelectedCapType = (CapType)CapTypeDropdown.SelectedItem;
-        }
-
         private void OnCapTypeDropdownSelectedItemChanged(object sender, EventArgs e)
         {
-            FindSelectedTypeFromDropdown();
             Layout();
         }
 
diff --git a/grapher/Models/Options/Cap/CapTypeOptions.cs b/grapher/Models/Options/Cap/CapTypeOptions.cs
index b2cca57..4ea372b 100644
--- a/grapher/Models/Options/Cap/CapTypeOptions.cs
+++ b/grapher/Models/Options/Cap/CapTypeOptions.cs
@@ -13,8 +13,8 @@ namespace grapher.Models.Options.Cap
 
         public enum CapType
         {
-            In,
-            Out,
+            Input,
+            Output,
             Both,
         }
 
@@ -37,12 +37,12 @@ namespace grapher.Models.Options.Cap
 
         public static readonly CapTypeOption InCap = new CapTypeOption
         {
-            Type = CapType.In,
+            Type = CapType.Input,
         };
 
         public static readonly CapTypeOption OutCap = new CapTypeOption
         {
-            Type = CapType.Out,
+            Type = CapType.Output,
         };
 
         public static readonly CapTypeOption BothCap = new CapTypeOption
@@ -70,13 +70,22 @@ namespace grapher.Models.Options.Cap
                   dropdown,
                   activeValueLabel)
         {
+            OptionsDropdown.Items.AddRange(
+                new CapTypeOption[]
+                {
+                    InCap,
+                    OutCap,
+                    BothCap
+                });
         }
 
         #endregion Constructors
 
         #region Properties
 
-        CapTypeOption CapOption
+        public CapType SelectedCapType => SelectedCapOption.Type;
+
+        public CapTypeOption SelectedCapOption
         {
             get
             {
@@ -89,5 +98,29 @@ namespace grapher.Models.Options.Cap
         }
 
         #endregion Properties
+
+        #region Methods
+
+        public static CapTypeOption CapTypeOptionFromSettings(ClassicCapMode capMode)
+        {
+            switch (capMode)
+            {
+                case ClassicCapMode.output:
+                    return OutCap;
+                case ClassicCapMode.in_out:
+                    return BothCap;
+                case ClassicCapMode.input:
+                default:
+                    return InCap;
+            }
+        }
+
+        public void SetActiveValue(ClassicCapMode capMode)
+        {
+            SelectedCapOption = CapTypeOptionFromSettings(capMode);
+            ActiveValueLabel.SetValue(SelectedCapOption.Name);
+        }
+
+        #endregion Methods
     }
 }
diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj
index abc06df..bd6674d 100644
--- a/grapher/grapher.csproj
+++ b/grapher/grapher.csproj
@@ -135,7 +135,10 @@
     <Compile Include="Layouts\NaturalLayout.cs" />
     <Compile Include="Layouts\OffLayout.cs" />
     <Compile Include="Layouts\PowerLayout.cs" />
+    <Compile Include="Models\Options\Cap\CapOptions.cs" />
+    <Compile Include="Models\Options\Cap\CapTypeOptions.cs" />
     <Compile Include="Models\Options\CheckBoxOption.cs" />
+    <Compile Include="Models\Options\ComboBoxOptionsBase.cs" />
     <Compile Include="Models\Options\Directionality\DirectionalityOptions.cs" />
     <Compile Include="Models\Options\LockableOption.cs" />
     <Compile Include="Models\Options\LUT\LutApplyOptions.cs" />