summaryrefslogtreecommitdiff
path: root/grapher/Models
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2021-04-05 22:41:16 -0700
committerJacob Palecki <[email protected]>2021-04-05 22:41:16 -0700
commitdb593584edb93b053396259db4c4acbeee0ee9e6 (patch)
treef7409206047b1093d42364acadeb26a2a69403b7 /grapher/Models
parentupdate wrapper + writer to handle lut (diff)
downloadrawaccel-db593584edb93b053396259db4c4acbeee0ee9e6.tar.xz
rawaccel-db593584edb93b053396259db4c4acbeee0ee9e6.zip
LUT GUI fixes
Diffstat (limited to 'grapher/Models')
-rw-r--r--grapher/Models/AccelGUIFactory.cs10
-rw-r--r--grapher/Models/Options/AccelTypeOptions.cs2
-rw-r--r--grapher/Models/Options/TextOption.cs3
3 files changed, 10 insertions, 5 deletions
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