11 files changed, 32 insertions, 21 deletions
diff --git a/grapher/Layouts/ClassicLayout.cs b/grapher/Layouts/ClassicLayout.cs
index 093f7fa..05f6c82 100644
--- a/grapher/Layouts/ClassicLayout.cs
+++ b/grapher/Layouts/ClassicLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Classic";
-            Index = 2;
+            Index = (int)AccelMode.classic;
             ShowOptions = new bool[] { true, true, true, false }; 
             OptionNames = new string[] { Offset, Acceleration, Exponent, string.Empty }; 
         }
diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs
index 095afdf..42841d5 100644
--- a/grapher/Layouts/DefaultLayout.cs
+++ b/grapher/Layouts/DefaultLayout.cs
@@ -1,10 +1,12 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+
 namespace grapher.Layouts
 {
     public class DefaultLayout : LayoutBase
@@ -13,7 +15,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Default";
-            Index = 0;
+            Index = (int)AccelMode.noaccel;
             ShowOptions = new bool[] { true, true, true, true }; 
             OptionNames = new string[] { Offset, Acceleration, $"{Limit}\\{Exponent}", Midpoint };
             ButtonEnabled = false;
diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
index a4d0827..3ae2e90 100644
--- a/grapher/Layouts/LayoutBase.cs
+++ b/grapher/Layouts/LayoutBase.cs
@@ -26,7 +26,7 @@ namespace grapher.Layouts
 
         /// <summary>
         ///  Gets or sets mapping from acceleration type to identifying integer.
-        ///  Must match order in tagged_union in rawaccel.hpp (which is 1-indexed, meaning 0 is off.)
+        ///  Must match accel_mode defined in rawaccel-settings.h
         /// </summary>
         public int Index { get; internal set; }
 
diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs
index 2a0358e..0a79a64 100644
--- a/grapher/Layouts/LinearLayout.cs
+++ b/grapher/Layouts/LinearLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Linear";
-            Index = 1;
+            Index = (int)AccelMode.linear;
             ShowOptions = new bool[] { true, true, false, false }; 
             OptionNames = new string[] { Offset, Acceleration, string.Empty, string.Empty }; 
         }
diff --git a/grapher/Layouts/LogLayout.cs b/grapher/Layouts/LogLayout.cs
index ae1a8f5..1206fb3 100644
--- a/grapher/Layouts/LogLayout.cs
+++ b/grapher/Layouts/LogLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Logarithmic";
-            Index = 4;
+            Index = (int)AccelMode.logarithmic;
             ShowOptions = new bool[] { true, true, false, false }; 
             OptionNames = new string[] { Offset, Acceleration, string.Empty, string.Empty }; 
         }
diff --git a/grapher/Layouts/NaturalGainLayout.cs b/grapher/Layouts/NaturalGainLayout.cs
index e062850..9bb1ec8 100644
--- a/grapher/Layouts/NaturalGainLayout.cs
+++ b/grapher/Layouts/NaturalGainLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "NaturalGain";
-            Index = 7;
+            Index = (int)AccelMode.naturalgain;
             ShowOptions = new bool[] { true, true, true, false }; 
             OptionNames = new string[] { Offset, Acceleration, Limit, string.Empty }; 
         }
diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs
index 743135c..44c6c18 100644
--- a/grapher/Layouts/NaturalLayout.cs
+++ b/grapher/Layouts/NaturalLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Natural";
-            Index = 3;
+            Index = (int)AccelMode.natural;
             ShowOptions = new bool[] { true, true, true, false }; 
             OptionNames = new string[] { Offset, Acceleration, Limit, string.Empty }; 
         }
diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs
index 087885f..ce7c149 100644
--- a/grapher/Layouts/OffLayout.cs
+++ b/grapher/Layouts/OffLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Off";
-            Index = 9;
+            Index = (int)AccelMode.noaccel;
             ShowOptions = new bool[] { false, false, false, false }; 
             OptionNames = new string[] { string.Empty, string.Empty, string.Empty, string.Empty };
             ShowOptionsXY = new bool[] { false, false }; 
diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs
index da02cf5..c14083a 100644
--- a/grapher/Layouts/PowerLayout.cs
+++ b/grapher/Layouts/PowerLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Power";
-            Index = 6;
+            Index = (int)AccelMode.power;
             ShowOptions = new bool[] { true, true, true, false }; 
             OptionNames = new string[] { Offset, Scale, Exponent, string.Empty }; 
         }
diff --git a/grapher/Layouts/SigmoidGainLayout.cs b/grapher/Layouts/SigmoidGainLayout.cs
index c620925..93214ec 100644
--- a/grapher/Layouts/SigmoidGainLayout.cs
+++ b/grapher/Layouts/SigmoidGainLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "SigmoidGain";
-            Index = 8;
+            Index = (int)AccelMode.sigmoidgain;
             ShowOptions = new bool[] { true, true, true, true }; 
             OptionNames = new string[] { Offset, Acceleration, Limit, Midpoint }; 
         }
diff --git a/grapher/Layouts/SigmoidLayout.cs b/grapher/Layouts/SigmoidLayout.cs
index 0dec3bf..1c7f0b9 100644
--- a/grapher/Layouts/SigmoidLayout.cs
+++ b/grapher/Layouts/SigmoidLayout.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Serialized;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,7 +13,7 @@ namespace grapher.Layouts
             : base()
         {
             Name = "Sigmoid";
-            Index = 5;
+            Index = (int)AccelMode.sigmoid;
             ShowOptions = new bool[] { true, true, true, true }; 
             OptionNames = new string[] { Offset, Acceleration, Limit, Midpoint }; 
         }