diff options
| author | Jacob Palecki <[email protected]> | 2021-04-25 23:05:44 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2021-04-25 23:05:44 -0700 |
| commit | 0cf5ce3762926fa556418572e9661d79cbbaa240 (patch) | |
| tree | f5dd9c5c77acf0f4a8d910636660bed93f8fb16b /grapher/Layouts | |
| parent | Fixed layout issues for LUT (diff) | |
| download | rawaccel-0cf5ce3762926fa556418572e9661d79cbbaa240.tar.xz rawaccel-0cf5ce3762926fa556418572e9661d79cbbaa240.zip | |
Start of LUT points editing
Diffstat (limited to 'grapher/Layouts')
| -rw-r--r-- | grapher/Layouts/ClassicLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/DefaultLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/JumpLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/LUTLayout.cs | 5 | ||||
| -rw-r--r-- | grapher/Layouts/LayoutBase.cs | 15 | ||||
| -rw-r--r-- | grapher/Layouts/LinearLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/MotivityLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/NaturalLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/OffLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/PowerLayout.cs | 3 | ||||
| -rw-r--r-- | grapher/Layouts/UnsupportedLayout.cs | 3 |
11 files changed, 32 insertions, 15 deletions
diff --git a/grapher/Layouts/ClassicLayout.cs b/grapher/Layouts/ClassicLayout.cs index fe5c25d..ca9195e 100644 --- a/grapher/Layouts/ClassicLayout.cs +++ b/grapher/Layouts/ClassicLayout.cs @@ -19,7 +19,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(true, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs index 8146255..055536a 100644 --- a/grapher/Layouts/DefaultLayout.cs +++ b/grapher/Layouts/DefaultLayout.cs @@ -20,7 +20,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(true, Limit); ExponentLayout = new OptionLayout(true, Exponent); MidpointLayout = new OptionLayout(true, Midpoint); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/JumpLayout.cs b/grapher/Layouts/JumpLayout.cs index cf5eb24..4e34ef3 100644 --- a/grapher/Layouts/JumpLayout.cs +++ b/grapher/Layouts/JumpLayout.cs @@ -20,7 +20,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, Limit); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 1ca5915..37c336e 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -8,7 +8,7 @@ namespace grapher.Layouts { public class LUTLayout : LayoutBase { - public const string LUTLayoutText = "This mode is for advanced users only. It requires a lut.json file to define the velocity curve. See the guide for specifics."; + public const string LUTLayoutText = "This mode is for advanced users only. We recommend setting points in the settings file with a script."; /// <summary> /// String small enough to fit in active value label @@ -30,7 +30,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(true, LUTLayoutText); + LutTextLayout = new OptionLayout(true, LUTLayoutText); + LutPanelLayout = new OptionLayout(true, string.Empty); } public override string ActiveName => LUTActiveName; diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 82d10d8..bc207d3 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -28,7 +28,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); GainSwitchOptionLayout = new OptionLayout(false, string.Empty); LogarithmicCharts = false; @@ -58,7 +59,9 @@ namespace grapher.Layouts protected OptionLayout MidpointLayout { get; set; } - protected OptionLayout LUTTextLayout { get; set; } + protected OptionLayout LutTextLayout { get; set; } + + protected OptionLayout LutPanelLayout { get; set; } protected OptionLayout GainSwitchOptionLayout { get; set; } @@ -78,6 +81,7 @@ namespace grapher.Layouts IOption expOption, IOption midpointOption, IOption lutTextOption, + IOption lutPanelOption, int top) { @@ -93,7 +97,8 @@ namespace grapher.Layouts (LimitLayout, limitOption), (ExponentLayout, expOption), (MidpointLayout, midpointOption), - (LUTTextLayout, lutTextOption)}) + (LutTextLayout, lutTextOption), + (LutPanelLayout, lutPanelOption)}) { option.Item1.Layout(option.Item2); @@ -123,7 +128,8 @@ namespace grapher.Layouts IOption limitOption, IOption expOption, IOption midpointOption, - IOption lutTextOption) + IOption lutTextOption, + IOption lutPanelOption) { Layout(gainSwitchOption, accelOption, @@ -135,6 +141,7 @@ namespace grapher.Layouts expOption, midpointOption, lutTextOption, + lutPanelOption, accelOption.Top); } } diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs index 88be3d4..6447833 100644 --- a/grapher/Layouts/LinearLayout.cs +++ b/grapher/Layouts/LinearLayout.cs @@ -22,7 +22,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/MotivityLayout.cs b/grapher/Layouts/MotivityLayout.cs index 7458dfc..7ab2f3f 100644 --- a/grapher/Layouts/MotivityLayout.cs +++ b/grapher/Layouts/MotivityLayout.cs @@ -25,7 +25,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(true, Motivity); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(true, Midpoint); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs index ece2b00..245a37b 100644 --- a/grapher/Layouts/NaturalLayout.cs +++ b/grapher/Layouts/NaturalLayout.cs @@ -20,7 +20,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(true, Limit); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs index e802113..16e5c19 100644 --- a/grapher/Layouts/OffLayout.cs +++ b/grapher/Layouts/OffLayout.cs @@ -20,7 +20,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs index bb07457..bf40c24 100644 --- a/grapher/Layouts/PowerLayout.cs +++ b/grapher/Layouts/PowerLayout.cs @@ -18,7 +18,8 @@ LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(true, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(false, string.Empty); + LutTextLayout = new OptionLayout(false, string.Empty); + LutPanelLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/UnsupportedLayout.cs b/grapher/Layouts/UnsupportedLayout.cs index 1607a6c..c17812d 100644 --- a/grapher/Layouts/UnsupportedLayout.cs +++ b/grapher/Layouts/UnsupportedLayout.cs @@ -25,7 +25,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(true, LUTLayoutText); + LutTextLayout = new OptionLayout(true, LUTLayoutText); + LutPanelLayout = new OptionLayout(false, string.Empty); } } }
\ No newline at end of file |