LUT GUI fixes

5 files changed, 34 insertions, 16 deletions

diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index 1fbe28b..488d6bb 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -71,7 +71,7 @@ namespace grapher
             System.Windows.Forms.DataVisualization.Charting.Title title6 = new System.Windows.Forms.DataVisualization.Charting.Title();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawAcceleration));
             this.optionsPanel = new System.Windows.Forms.Panel();
-            this.LUTTextLabel = new System.Windows.Forms.Label();
+            this.LUTTextLabelX = new System.Windows.Forms.Label();
             this.FakeBox = new System.Windows.Forms.CheckBox();
             this.DirectionalityPanel = new System.Windows.Forms.Panel();
             this.LpNormActiveValue = new System.Windows.Forms.Label();
@@ -189,6 +189,7 @@ namespace grapher
             this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.VelocityChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
+            this.LUTTextLabelY = new System.Windows.Forms.Label();
             this.optionsPanel.SuspendLayout();
             this.DirectionalityPanel.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -204,7 +205,8 @@ namespace grapher
             // optionsPanel
             // 
             this.optionsPanel.AutoSize = true;
-            this.optionsPanel.Controls.Add(this.LUTTextLabel);
+            this.optionsPanel.Controls.Add(this.LUTTextLabelY);
+            this.optionsPanel.Controls.Add(this.LUTTextLabelX);
             this.optionsPanel.Controls.Add(this.FakeBox);
             this.optionsPanel.Controls.Add(this.DirectionalityPanel);
             this.optionsPanel.Controls.Add(this.toggleButton);
@@ -285,14 +287,14 @@ namespace grapher
             this.optionsPanel.Size = new System.Drawing.Size(483, 956);
             this.optionsPanel.TabIndex = 34;
             // 
-            // LUTTextLabel
+            // LUTTextLabelX
             // 
-            this.LUTTextLabel.AutoSize = true;
-            this.LUTTextLabel.Location = new System.Drawing.Point(38, 350);
-            this.LUTTextLabel.Name = "LUTTextLabel";
-            this.LUTTextLabel.Size = new System.Drawing.Size(52, 13);
-            this.LUTTextLabel.TabIndex = 152;
-            this.LUTTextLabel.Text = "LUT Text";
+            this.LUTTextLabelX.AutoSize = true;
+            this.LUTTextLabelX.Location = new System.Drawing.Point(38, 350);
+            this.LUTTextLabelX.Name = "LUTTextLabelX";
+            this.LUTTextLabelX.Size = new System.Drawing.Size(52, 13);
+            this.LUTTextLabelX.TabIndex = 152;
+            this.LUTTextLabelX.Text = "LUT Text";
             // 
             // FakeBox
             // 
@@ -1506,6 +1508,15 @@ namespace grapher
             title6.Text = "Sensitivity";
             this.AccelerationChart.Titles.Add(title6);
             // 
+            // LUTTextLabelY
+            // 
+            this.LUTTextLabelY.AutoSize = true;
+            this.LUTTextLabelY.Location = new System.Drawing.Point(266, 350);
+            this.LUTTextLabelY.Name = "LUTTextLabelY";
+            this.LUTTextLabelY.Size = new System.Drawing.Size(52, 13);
+            this.LUTTextLabelY.TabIndex = 153;
+            this.LUTTextLabelY.Text = "LUT Text";
+            // 
             // RawAcceleration
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1653,7 +1664,8 @@ namespace grapher
         private System.Windows.Forms.Label RangeActiveValueY;
         private System.Windows.Forms.CheckBox FakeBox;
         private System.Windows.Forms.ToolStripMenuItem UseSpecificDeviceMenuItem;
-        private System.Windows.Forms.Label LUTTextLabel;
+        private System.Windows.Forms.Label LUTTextLabelX;
+        private System.Windows.Forms.Label LUTTextLabelY;
     }
 }
 
diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index a4ece9e..6ed9c46 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -119,7 +119,8 @@ namespace grapher
                 limitLabelY,
                 expLabelX,
                 expLabelY,
-                LUTTextLabel,
+                LUTTextLabelX,
+                LUTTextLabelY,
                 constantThreeLabelX,
                 constantThreeLabelY,
                 ActiveValueTitle,
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index c8446f0..e3a16b6 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -85,7 +85,8 @@ namespace grapher.Models
             Label limitLabelY,
             Label expLabelX,
             Label expLabelY,
-            Label lutTextLabel,
+            Label lutTextLabelX,
+            Label lutTextLabelY,
             Label constantThreeLabelX,
             Label constantThreeLabelY,
             Label activeValueTitleX,
@@ -333,7 +334,8 @@ namespace grapher.Models
                 legacyCapToolStripMenuItem,
                 capY);
 
-            var lutText = new TextOption(lutTextLabel);
+            var lutTextX = new TextOption(lutTextLabelX);
+            var lutTextY = new TextOption(lutTextLabelY);
 
             var accelerationOptionsX = new AccelTypeOptions(
                 accelTypeDropX,
@@ -345,7 +347,7 @@ namespace grapher.Models
                 limitX,
                 exponentX,
                 midpointX,
-                lutText,
+                lutTextX,
                 writeButton,
                 new ActiveValueLabel(accelTypeActiveLabelX, activeValueTitleX));
 
@@ -359,7 +361,7 @@ namespace grapher.Models
                 limitY,
                 exponentY,
                 midpointY,
-                lutText,
+                lutTextY,
                 writeButton,
                 new ActiveValueLabel(accelTypeActiveLabelY, activeValueTitleY));
 
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 556f969..68eccf5 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -20,8 +20,8 @@ namespace grapher
             new JumpLayout(),
             new PowerLayout(),
             new MotivityLayout(),
-            new OffLayout(),
             new LUTLayout(),
+            new OffLayout(),
         }.ToDictionary(k => k.Name);
 
         public static readonly AccelArgs DefaultArgs = new DriverSettings().args.x;
diff --git a/grapher/Models/Options/TextOption.cs b/grapher/Models/Options/TextOption.cs
index bbdedca..292b805 100644
--- a/grapher/Models/Options/TextOption.cs
+++ b/grapher/Models/Options/TextOption.cs
@@ -14,6 +14,9 @@ namespace grapher.Models.Options
         public TextOption(Label label)
         {
             Label = label;
+            Label.AutoSize = false;
+            Label.Width = 150;
+            Label.Height = 100;
         }
 
         #endregion Constructors