From 7622f542daa27db332334d0af25faa9651a1c831 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sat, 19 Sep 2020 21:24:59 -0700 Subject: log sigmoid sens done --- grapher/Models/Options/AccelTypeOptions.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 917ac5c..6f547cd 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -21,6 +21,7 @@ namespace grapher new LogarithmLayout(), new NaturalGainLayout(), new SigmoidGainLayout(), + new ExperimentOneLayout(), new OffLayout() }.ToDictionary(k => k.Name); -- cgit v1.2.3 From 8e58892723ee10792c7d3db275da826f98d01677 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 02:28:35 -0700 Subject: Mostly works --- grapher/Models/Options/AccelTypeOptions.cs | 7 +++++-- grapher/Models/Options/ApplyOptions.cs | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 6f547cd..ce5ec54 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -64,6 +64,7 @@ namespace grapher #endregion Constructors #region Properties + public AccelCharts AccelCharts { get; } public Button WriteButton { get; } @@ -180,8 +181,8 @@ namespace grapher public void SetActiveValues(int index, AccelArgs args) { - var name = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value.Name; - AccelTypeActiveValue.SetValue(name); + AccelerationType = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value; + AccelTypeActiveValue.SetValue(AccelerationType.Name); Weight.SetActiveValue(args.weight); Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0); @@ -189,6 +190,8 @@ namespace grapher Acceleration.SetActiveValue(args.accel); LimitOrExponent.SetActiveValue(args.exponent); Midpoint.SetActiveValue(args.midpoint); + + Layout(); } public void ShowFull() diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs index 6ec9d31..720cb13 100644 --- a/grapher/Models/Options/ApplyOptions.cs +++ b/grapher/Models/Options/ApplyOptions.cs @@ -130,6 +130,10 @@ namespace grapher.Models.Options settings.args.x, settings.args.y, settings.combineMagnitudes); + + AccelCharts.SetLogarithmic( + OptionSetX.Options.AccelerationType.LogarithmicCharts, + OptionSetY.Options.AccelerationType.LogarithmicCharts); } public void OnWholeClicked(object sender, EventArgs e) -- cgit v1.2.3 From 2c288f95f2c3791daf54299580e19439c3dd1b0c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 03:16:36 -0700 Subject: Fix bug & rename x axis to input speed --- grapher/Models/Options/AccelOptionSet.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs index bc0d368..11a7f10 100644 --- a/grapher/Models/Options/AccelOptionSet.cs +++ b/grapher/Models/Options/AccelOptionSet.cs @@ -24,6 +24,7 @@ namespace grapher.Models.Options OptionsTitle.Top = TopAnchor; IsTitleMode = true; + Hidden = false; SetRegularMode(); } @@ -35,9 +36,10 @@ namespace grapher.Models.Options public AccelTypeOptions Options { get; } - public bool IsTitleMode { get; private set; } + private bool Hidden { get; set; } + public void SetRegularMode() { if (IsTitleMode) @@ -67,6 +69,7 @@ namespace grapher.Models.Options OptionsTitle.Hide(); ActiveValuesTitle.Hide(); Options.Hide(); + Hidden = true; } public void Show() @@ -78,6 +81,7 @@ namespace grapher.Models.Options ActiveValuesTitle.Show(); Options.Show(); + Hidden = false; } public void DisplayTitle() @@ -106,7 +110,10 @@ namespace grapher.Models.Options public void SetActiveValues(int mode, AccelArgs args) { - Options.SetActiveValues(mode, args); + if (!Hidden) + { + Options.SetActiveValues(mode, args); + } } public void AlignActiveValues() -- cgit v1.2.3 From 45285413a94c9c081098c672e69e9811ac5262b7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 13:08:31 -0700 Subject: Rename experiment two to motivity --- grapher/Models/Options/AccelTypeOptions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index ce5ec54..1302387 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -21,7 +21,7 @@ namespace grapher new LogarithmLayout(), new NaturalGainLayout(), new SigmoidGainLayout(), - new ExperimentOneLayout(), + new MotivityLayout(), new OffLayout() }.ToDictionary(k => k.Name); -- cgit v1.2.3 From df6c77a9279240b169b441fcd87ce5f8f3dd1798 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 14:07:55 -0700 Subject: Fix cap style defaulting to legacy --- grapher/Models/Options/AccelTypeOptions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 1302387..d93be16 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -185,7 +185,7 @@ namespace grapher AccelTypeActiveValue.SetValue(AccelerationType.Name); Weight.SetActiveValue(args.weight); - Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0); + Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0 || args.scaleCap <= 0); Offset.SetActiveValue(args.offset, args.legacy_offset); Acceleration.SetActiveValue(args.accel); LimitOrExponent.SetActiveValue(args.exponent); -- cgit v1.2.3 From 20b0304e0edc12eb983707c44f69a1c2be23ae4c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 14:16:34 -0700 Subject: Rename active to current, make dropdown display accel type on active value set --- grapher/Models/Options/AccelTypeOptions.cs | 3 ++- grapher/Models/Options/ActiveValueLabel.cs | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index d93be16..ef0964b 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -183,6 +183,7 @@ namespace grapher { AccelerationType = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value; AccelTypeActiveValue.SetValue(AccelerationType.Name); + AccelDropdown.SelectedIndex = AccelerationType.Index; Weight.SetActiveValue(args.weight); Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0 || args.scaleCap <= 0); @@ -191,7 +192,7 @@ namespace grapher LimitOrExponent.SetActiveValue(args.exponent); Midpoint.SetActiveValue(args.midpoint); - Layout(); + //Layout(); } public void ShowFull() diff --git a/grapher/Models/Options/ActiveValueLabel.cs b/grapher/Models/Options/ActiveValueLabel.cs index 18a4400..66817ab 100644 --- a/grapher/Models/Options/ActiveValueLabel.cs +++ b/grapher/Models/Options/ActiveValueLabel.cs @@ -5,11 +5,6 @@ namespace grapher.Models.Options { public class ActiveValueLabel { - #region Constants - - - #endregion Constants - #region Fields private string _prefix; -- cgit v1.2.3 From c87bd1f04059f40f3dadd4e0b5bfcd860db67770 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 14:41:56 -0700 Subject: Rename write button --- grapher/Models/Options/AccelTypeOptions.cs | 2 -- 1 file changed, 2 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index ef0964b..16029ce 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -191,8 +191,6 @@ namespace grapher Acceleration.SetActiveValue(args.accel); LimitOrExponent.SetActiveValue(args.exponent); Midpoint.SetActiveValue(args.midpoint); - - //Layout(); } public void ShowFull() -- cgit v1.2.3 From f4ff6334df8a3fd66d13082606b69a78fa592237 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 15:26:08 -0700 Subject: Remove sigmoidgain, only allow one instance of grapher to run at a time --- grapher/Models/Options/AccelTypeOptions.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 16029ce..9bd42f5 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -17,10 +17,9 @@ namespace grapher new LinearLayout(), new ClassicLayout(), new NaturalLayout(), + new NaturalGainLayout(), new PowerLayout(), new LogarithmLayout(), - new NaturalGainLayout(), - new SigmoidGainLayout(), new MotivityLayout(), new OffLayout() }.ToDictionary(k => k.Name); -- cgit v1.2.3