From cf1fdf2e6cdba8c6ae8493eb744f223b6324594c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 20:43:08 -0700 Subject: LUT text layout --- grapher/Layouts/LayoutBase.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 83af292..1d2615d 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -55,6 +55,8 @@ namespace grapher.Layouts protected OptionLayout MidpointLayout { get; set; } + protected OptionLayout LUTTextLayout { get; set; } + public void Layout( IOption accelOption, IOption scaleOption, @@ -64,6 +66,7 @@ namespace grapher.Layouts IOption limitOption, IOption expOption, IOption midpointOption, + IOption lutTextOption, int top) { @@ -77,7 +80,8 @@ namespace grapher.Layouts (OffsetLayout, offsetOption), (LimitLayout, limitOption), (ExponentLayout, expOption), - (MidpointLayout, midpointOption)}) + (MidpointLayout, midpointOption), + (LUTTextLayout, lutTextOption)}) { option.Item1.Layout(option.Item2); @@ -105,7 +109,8 @@ namespace grapher.Layouts IOption offsetOption, IOption limitOption, IOption expOption, - IOption midpointOption) + IOption midpointOption, + IOption lutTextOption) { Layout(accelOption, scaleOption, @@ -115,6 +120,7 @@ namespace grapher.Layouts limitOption, expOption, midpointOption, + lutTextOption, accelOption.Top); } } -- cgit v1.2.3 From 019665015ab30893209ab49fea352405b144f0f8 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 23:36:26 -0700 Subject: Add gain switch --- grapher/Layouts/LayoutBase.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 1d2615d..6343ca2 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -14,6 +14,8 @@ namespace grapher.Layouts public const string Offset = "Offset"; public const string Cap = "Cap"; public const string Weight = "Weight"; + public const string Smooth = "Smooth"; + public const string Gain = "Gain"; public LayoutBase() { @@ -25,6 +27,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); + GainSwitchOptionLayout = new OptionLayout(false, string.Empty); LogarithmicCharts = false; } @@ -57,7 +61,10 @@ namespace grapher.Layouts protected OptionLayout LUTTextLayout { get; set; } + protected OptionLayout GainSwitchOptionLayout { get; set; } + public void Layout( + IOption gainSwitchOption, IOption accelOption, IOption scaleOption, IOption capOption, @@ -73,6 +80,7 @@ namespace grapher.Layouts IOption previous = null; foreach (var option in new (OptionLayout, IOption)[] { + (GainSwitchOptionLayout, gainSwitchOption), (AccelLayout, accelOption), (ScaleLayout, scaleOption), (CapLayout, capOption), @@ -102,6 +110,7 @@ namespace grapher.Layouts } public void Layout( + IOption gainSwitchOption, IOption accelOption, IOption scaleOption, IOption capOption, @@ -112,7 +121,8 @@ namespace grapher.Layouts IOption midpointOption, IOption lutTextOption) { - Layout(accelOption, + Layout(gainSwitchOption, + accelOption, scaleOption, capOption, weightOption, -- cgit v1.2.3 From 758de1d236f591de1d8b2fba4c58bfd8d5bbd26e Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 6 Apr 2021 18:04:28 -0700 Subject: Rename accelMotivity to growthRate --- grapher/Layouts/LayoutBase.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 6343ca2..7baf5ed 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -16,6 +16,7 @@ namespace grapher.Layouts public const string Weight = "Weight"; public const string Smooth = "Smooth"; public const string Gain = "Gain"; + public const string GrowthRate = "Growth Rate"; public LayoutBase() { -- cgit v1.2.3 From 258fcd3bd236a787f07d7dac2049be524d86cb75 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 6 Apr 2021 23:11:20 -0700 Subject: Fix natural legacy algorithm, rename accelNatural to decayRate --- grapher/Layouts/LayoutBase.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 7baf5ed..d9d85b1 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -17,6 +17,7 @@ namespace grapher.Layouts public const string Smooth = "Smooth"; public const string Gain = "Gain"; public const string GrowthRate = "Growth Rate"; + public const string DecayRate = "Decay Rate"; public LayoutBase() { -- cgit v1.2.3 From 5e858b059436375ed1c17f7dc1b3e47a7e8e1d5d Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 7 Apr 2021 01:05:59 -0700 Subject: Add active value labels for gain switch --- grapher/Layouts/LayoutBase.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index d9d85b1..e3583c4 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -1,5 +1,4 @@ using grapher.Models.Options; -using System.Windows.Forms; namespace grapher.Layouts { -- cgit v1.2.3 From a6926be0e911b7b7637861866f41c3bca31a87a3 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 13 Apr 2021 23:59:21 -0400 Subject: move arbitrary input into settings separate arbitrary mode from spaced modes, arbitrary now deserializes from default settings file --- grapher/Layouts/LayoutBase.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index e3583c4..900d611 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -34,11 +34,7 @@ namespace grapher.Layouts LogarithmicCharts = false; } - /// - /// Gets or sets mapping from acceleration type to identifying integer. - /// Must match accel_mode defined in rawaccel-settings.h - /// - public int Index { get; protected set; } + public AccelMode Mode { get; protected set; } public string Name { get; protected set; } @@ -64,6 +60,11 @@ namespace grapher.Layouts protected OptionLayout GainSwitchOptionLayout { get; set; } + public override string ToString() + { + return Name; + } + public void Layout( IOption gainSwitchOption, IOption accelOption, -- cgit v1.2.3 From 0af5b1d23be9ecfb0134c957197cfd8f838b7998 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 25 Apr 2021 21:57:25 -0700 Subject: Fixed layout issues for LUT --- grapher/Layouts/LayoutBase.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 900d611..82d10d8 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -38,6 +38,8 @@ namespace grapher.Layouts public string Name { get; protected set; } + public virtual string ActiveName { get => Name; } + public bool LogarithmicCharts { get; protected set; } protected OptionLayout AccelLayout { get; set; } -- cgit v1.2.3 From 0cf5ce3762926fa556418572e9661d79cbbaa240 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 25 Apr 2021 23:05:44 -0700 Subject: Start of LUT points editing --- grapher/Layouts/LayoutBase.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') 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); } } -- cgit v1.2.3 From abbe20f63aded56c4714766ca1b93183eafa062a Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 30 Jun 2021 00:01:26 -0700 Subject: Add class for LUT apply type --- grapher/Layouts/LayoutBase.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index bc207d3..db914dc 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -30,6 +30,7 @@ namespace grapher.Layouts MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); GainSwitchOptionLayout = new OptionLayout(false, string.Empty); LogarithmicCharts = false; @@ -63,6 +64,8 @@ namespace grapher.Layouts protected OptionLayout LutPanelLayout { get; set; } + protected OptionLayout LutApplyOptionsLayout { get; set; } + protected OptionLayout GainSwitchOptionLayout { get; set; } public override string ToString() @@ -82,6 +85,7 @@ namespace grapher.Layouts IOption midpointOption, IOption lutTextOption, IOption lutPanelOption, + IOption lutApplyOption, int top) { @@ -98,7 +102,8 @@ namespace grapher.Layouts (ExponentLayout, expOption), (MidpointLayout, midpointOption), (LutTextLayout, lutTextOption), - (LutPanelLayout, lutPanelOption)}) + (LutPanelLayout, lutPanelOption), + (LutApplyOptionsLayout, lutApplyOption)}) { option.Item1.Layout(option.Item2); @@ -129,7 +134,8 @@ namespace grapher.Layouts IOption expOption, IOption midpointOption, IOption lutTextOption, - IOption lutPanelOption) + IOption lutPanelOption, + IOption lutApplyOption) { Layout(gainSwitchOption, accelOption, @@ -142,6 +148,7 @@ namespace grapher.Layouts midpointOption, lutTextOption, lutPanelOption, + lutApplyOption, accelOption.Top); } } -- cgit v1.2.3