From 6c037f92a350d8622f3739b1033c909912860d77 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 14 Sep 2021 00:55:21 -0700 Subject: Mostly working cap type in GUI --- grapher/Layouts/LayoutBase.cs | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 66260eb..f16be64 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -15,18 +15,18 @@ namespace grapher.Layouts public const string Motivity = "Motivity"; public const string Offset = "Offset"; public const string Cap = "Cap"; + public const string CapType = "Cap Type"; public const string Weight = "Weight"; public const string Smooth = "Smooth"; public const string Gain = "Gain"; public LayoutBase() { - AccelLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty); GrowthRateLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty); - ScaleLayout = new OptionLayout(false, string.Empty); - CapLayout = new OptionLayout(false, string.Empty); + ClassicCapLayout = new OptionLayout(false, string.Empty); + PowerCapLayout = new OptionLayout(false, string.Empty); WeightLayout = new OptionLayout(false, string.Empty); OffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); @@ -49,17 +49,15 @@ namespace grapher.Layouts public bool LogarithmicCharts { get; protected set; } - protected OptionLayout AccelLayout { get; set; } - protected OptionLayout DecayRateLayout { get; set; } protected OptionLayout GrowthRateLayout { get; set; } protected OptionLayout SmoothLayout { get; set; } - protected OptionLayout ScaleLayout { get; set; } + protected OptionLayout ClassicCapLayout { get; set; } - protected OptionLayout CapLayout { get; set; } + protected OptionLayout PowerCapLayout { get; set; } protected OptionLayout WeightLayout { get; set; } @@ -88,12 +86,11 @@ namespace grapher.Layouts public void Layout( IOption gainSwitchOption, - IOption accelOption, + IOption classicCapOption, + IOption powerCapOption, IOption decayRateOption, IOption growthRateOption, IOption smoothOption, - IOption scaleOption, - IOption capOption, IOption weightOption, IOption offsetOption, IOption limitOption, @@ -110,12 +107,12 @@ namespace grapher.Layouts foreach (var option in new (OptionLayout, IOption)[] { (GainSwitchOptionLayout, gainSwitchOption), - (AccelLayout, accelOption), + (ClassicCapLayout, classicCapOption), + (PowerCapLayout, powerCapOption), + (GainSwitchOptionLayout, gainSwitchOption), (DecayRateLayout, decayRateOption), (GrowthRateLayout, growthRateOption), (SmoothLayout, smoothOption), - (ScaleLayout, scaleOption), - (CapLayout, capOption), (WeightLayout, weightOption), (OffsetLayout, offsetOption), (LimitLayout, limitOption), @@ -146,12 +143,11 @@ namespace grapher.Layouts public void Layout( IOption gainSwitchOption, - IOption accelOption, + IOption classicCapOption, + IOption powerCapOption, IOption decayRateOption, IOption growthRateOption, IOption smoothOption, - IOption scaleOption, - IOption capOption, IOption weightOption, IOption offsetOption, IOption limitOption, @@ -163,12 +159,11 @@ namespace grapher.Layouts IOption lutApplyOption) { Layout(gainSwitchOption, - accelOption, + classicCapOption, + powerCapOption, decayRateOption, growthRateOption, smoothOption, - scaleOption, - capOption, weightOption, offsetOption, limitOption, @@ -178,7 +173,7 @@ namespace grapher.Layouts lutTextOption, lutPanelOption, lutApplyOption, - accelOption.Top); + gainSwitchOption.Top); } } } -- cgit v1.2.3 From 8878091a2cab77b0433daea7a47033e1c35e42c1 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 15 Sep 2021 23:16:43 -0700 Subject: Cap type options now fully working --- grapher/Layouts/LayoutBase.cs | 2 -- 1 file changed, 2 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index f16be64..4a87504 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -14,7 +14,6 @@ namespace grapher.Layouts public const string Midpoint = "Midpoint"; public const string Motivity = "Motivity"; public const string Offset = "Offset"; - public const string Cap = "Cap"; public const string CapType = "Cap Type"; public const string Weight = "Weight"; public const string Smooth = "Smooth"; @@ -109,7 +108,6 @@ namespace grapher.Layouts (GainSwitchOptionLayout, gainSwitchOption), (ClassicCapLayout, classicCapOption), (PowerCapLayout, powerCapOption), - (GainSwitchOptionLayout, gainSwitchOption), (DecayRateLayout, decayRateOption), (GrowthRateLayout, growthRateOption), (SmoothLayout, smoothOption), -- cgit v1.2.3 From 4197e030c5cfeda5592816c8028152d9b7b599e0 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 16 Sep 2021 13:07:43 -0700 Subject: Remove weight --- grapher/Layouts/LayoutBase.cs | 7 ------- 1 file changed, 7 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 4a87504..e7b654f 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -26,7 +26,6 @@ namespace grapher.Layouts SmoothLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty); - WeightLayout = new OptionLayout(false, string.Empty); OffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty); @@ -58,8 +57,6 @@ namespace grapher.Layouts protected OptionLayout PowerCapLayout { get; set; } - protected OptionLayout WeightLayout { get; set; } - protected OptionLayout OffsetLayout { get; set; } protected OptionLayout LimitLayout { get; set; } @@ -90,7 +87,6 @@ namespace grapher.Layouts IOption decayRateOption, IOption growthRateOption, IOption smoothOption, - IOption weightOption, IOption offsetOption, IOption limitOption, IOption powerClassicOption, @@ -111,7 +107,6 @@ namespace grapher.Layouts (DecayRateLayout, decayRateOption), (GrowthRateLayout, growthRateOption), (SmoothLayout, smoothOption), - (WeightLayout, weightOption), (OffsetLayout, offsetOption), (LimitLayout, limitOption), (PowerClassicLayout, powerClassicOption), @@ -146,7 +141,6 @@ namespace grapher.Layouts IOption decayRateOption, IOption growthRateOption, IOption smoothOption, - IOption weightOption, IOption offsetOption, IOption limitOption, IOption powerClassicOption, @@ -162,7 +156,6 @@ namespace grapher.Layouts decayRateOption, growthRateOption, smoothOption, - weightOption, offsetOption, limitOption, powerClassicOption, -- cgit v1.2.3 From 1fd8881608e4ce6ab21fd78d3ebb42a941cd0e93 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 16 Sep 2021 18:33:30 -0700 Subject: Add power start from one --- grapher/Layouts/LayoutBase.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index e7b654f..a283008 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts public const string DecayRate = "Decay Rate"; public const string Scale = "Scale"; public const string Exponent = "Exponent"; + public const string StartsFrom = "Start from"; public const string PowerClassic = "Power"; public const string Limit = "Limit"; public const string Midpoint = "Midpoint"; @@ -30,6 +31,7 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); + PowerStartsFromLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); @@ -65,6 +67,8 @@ namespace grapher.Layouts protected OptionLayout ExponentLayout { get; set; } + protected OptionLayout PowerStartsFromLayout { get; set; } + protected OptionLayout MidpointLayout { get; set; } protected OptionLayout LutTextLayout { get; set; } @@ -91,6 +95,7 @@ namespace grapher.Layouts IOption limitOption, IOption powerClassicOption, IOption expOption, + IOption startsFromOption, IOption midpointOption, IOption lutTextOption, IOption lutPanelOption, @@ -111,6 +116,7 @@ namespace grapher.Layouts (LimitLayout, limitOption), (PowerClassicLayout, powerClassicOption), (ExponentLayout, expOption), + (PowerStartsFromLayout, startsFromOption), (MidpointLayout, midpointOption), (LutTextLayout, lutTextOption), (LutPanelLayout, lutPanelOption), @@ -145,6 +151,7 @@ namespace grapher.Layouts IOption limitOption, IOption powerClassicOption, IOption expOption, + IOption startsFromOption, IOption midpointOption, IOption lutTextOption, IOption lutPanelOption, @@ -160,6 +167,7 @@ namespace grapher.Layouts limitOption, powerClassicOption, expOption, + startsFromOption, midpointOption, lutTextOption, lutPanelOption, -- cgit v1.2.3 From 115030165d539fde5440f6232879c7a076dea2ec Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Sat, 18 Sep 2021 05:20:53 -0400 Subject: generalize power start-from-1 starting output is determined by (gain) offset --- grapher/Layouts/LayoutBase.cs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index a283008..1dced61 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -9,12 +9,12 @@ namespace grapher.Layouts public const string DecayRate = "Decay Rate"; public const string Scale = "Scale"; public const string Exponent = "Exponent"; - public const string StartsFrom = "Start from"; + public const string OutputOffset = "Output Offset"; public const string PowerClassic = "Power"; public const string Limit = "Limit"; public const string Midpoint = "Midpoint"; public const string Motivity = "Motivity"; - public const string Offset = "Offset"; + public const string InputOffset = "Input Offset"; public const string CapType = "Cap Type"; public const string Weight = "Weight"; public const string Smooth = "Smooth"; @@ -27,11 +27,11 @@ namespace grapher.Layouts SmoothLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty); - OffsetLayout = new OptionLayout(false, string.Empty); + InputOffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); - PowerStartsFromLayout = new OptionLayout(false, string.Empty); + OutputOffsetLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); @@ -59,7 +59,7 @@ namespace grapher.Layouts protected OptionLayout PowerCapLayout { get; set; } - protected OptionLayout OffsetLayout { get; set; } + protected OptionLayout InputOffsetLayout { get; set; } protected OptionLayout LimitLayout { get; set; } @@ -67,7 +67,7 @@ namespace grapher.Layouts protected OptionLayout ExponentLayout { get; set; } - protected OptionLayout PowerStartsFromLayout { get; set; } + protected OptionLayout OutputOffsetLayout { get; set; } protected OptionLayout MidpointLayout { get; set; } @@ -91,11 +91,11 @@ namespace grapher.Layouts IOption decayRateOption, IOption growthRateOption, IOption smoothOption, - IOption offsetOption, + IOption inputOffsetOption, IOption limitOption, IOption powerClassicOption, IOption expOption, - IOption startsFromOption, + IOption outputOffsetOption, IOption midpointOption, IOption lutTextOption, IOption lutPanelOption, @@ -112,11 +112,11 @@ namespace grapher.Layouts (DecayRateLayout, decayRateOption), (GrowthRateLayout, growthRateOption), (SmoothLayout, smoothOption), - (OffsetLayout, offsetOption), + (InputOffsetLayout, inputOffsetOption), (LimitLayout, limitOption), (PowerClassicLayout, powerClassicOption), (ExponentLayout, expOption), - (PowerStartsFromLayout, startsFromOption), + (OutputOffsetLayout, outputOffsetOption), (MidpointLayout, midpointOption), (LutTextLayout, lutTextOption), (LutPanelLayout, lutPanelOption), @@ -147,11 +147,11 @@ namespace grapher.Layouts IOption decayRateOption, IOption growthRateOption, IOption smoothOption, - IOption offsetOption, + IOption inputOffsetOption, IOption limitOption, IOption powerClassicOption, IOption expOption, - IOption startsFromOption, + IOption outputOffsetOption, IOption midpointOption, IOption lutTextOption, IOption lutPanelOption, @@ -163,11 +163,11 @@ namespace grapher.Layouts decayRateOption, growthRateOption, smoothOption, - offsetOption, + inputOffsetOption, limitOption, powerClassicOption, expOption, - startsFromOption, + outputOffsetOption, midpointOption, lutTextOption, lutPanelOption, -- cgit v1.2.3 From 4c4eabc0cb85cfef22900773649d96f610bb25dc Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Sun, 19 Sep 2021 02:08:06 -0400 Subject: fix jump fields --- grapher/Layouts/LayoutBase.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'grapher/Layouts/LayoutBase.cs') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 1dced61..e53b37e 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -19,6 +19,8 @@ namespace grapher.Layouts public const string Weight = "Weight"; public const string Smooth = "Smooth"; public const string Gain = "Gain"; + public const string Input = "Input"; + public const string Output = "Output"; public LayoutBase() { @@ -27,10 +29,12 @@ namespace grapher.Layouts SmoothLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty); + InputJumpLayout = new OptionLayout(false, string.Empty); InputOffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); + OutputJumpLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); @@ -59,6 +63,8 @@ namespace grapher.Layouts protected OptionLayout PowerCapLayout { get; set; } + protected OptionLayout InputJumpLayout { get; set; } + protected OptionLayout InputOffsetLayout { get; set; } protected OptionLayout LimitLayout { get; set; } @@ -67,6 +73,8 @@ namespace grapher.Layouts protected OptionLayout ExponentLayout { get; set; } + protected OptionLayout OutputJumpLayout { get; set; } + protected OptionLayout OutputOffsetLayout { get; set; } protected OptionLayout MidpointLayout { get; set; } @@ -91,10 +99,12 @@ namespace grapher.Layouts IOption decayRateOption, IOption growthRateOption, IOption smoothOption, + IOption inputJumpOption, IOption inputOffsetOption, IOption limitOption, IOption powerClassicOption, IOption expOption, + IOption outputJumpOption, IOption outputOffsetOption, IOption midpointOption, IOption lutTextOption, @@ -112,10 +122,12 @@ namespace grapher.Layouts (DecayRateLayout, decayRateOption), (GrowthRateLayout, growthRateOption), (SmoothLayout, smoothOption), + (InputJumpLayout, inputJumpOption), (InputOffsetLayout, inputOffsetOption), (LimitLayout, limitOption), (PowerClassicLayout, powerClassicOption), (ExponentLayout, expOption), + (OutputJumpLayout, outputJumpOption), (OutputOffsetLayout, outputOffsetOption), (MidpointLayout, midpointOption), (LutTextLayout, lutTextOption), @@ -147,10 +159,12 @@ namespace grapher.Layouts IOption decayRateOption, IOption growthRateOption, IOption smoothOption, + IOption inputJumpOption, IOption inputOffsetOption, IOption limitOption, IOption powerClassicOption, IOption expOption, + IOption outputJumpOption, IOption outputOffsetOption, IOption midpointOption, IOption lutTextOption, @@ -163,10 +177,12 @@ namespace grapher.Layouts decayRateOption, growthRateOption, smoothOption, + inputJumpOption, inputOffsetOption, limitOption, powerClassicOption, expOption, + outputJumpOption, outputOffsetOption, midpointOption, lutTextOption, -- cgit v1.2.3