From 9b4556c59f063e5c6816338c1608b354e1441fb0 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 9 Sep 2020 19:56:54 -0700 Subject: Add improved logarithm style --- 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 14c2019..917ac5c 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -18,6 +18,7 @@ namespace grapher new ClassicLayout(), new NaturalLayout(), new PowerLayout(), + new LogarithmLayout(), new NaturalGainLayout(), new SigmoidGainLayout(), new OffLayout() -- cgit v1.2.3 From 0e60f2c30b147605c22413af2de243cdc5373f7e Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 11 Sep 2020 12:59:25 -0700 Subject: Fix box write --- grapher/Models/Options/Option.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs index 5dc022b..c0d339e 100644 --- a/grapher/Models/Options/Option.cs +++ b/grapher/Models/Options/Option.cs @@ -119,7 +119,7 @@ namespace grapher { get { - return Field.Box.Visible; + return Field.Box.Enabled; } } @@ -140,14 +140,14 @@ namespace grapher public override void Hide() { - Field.Box.Hide(); + Field.Hide(); Label.Hide(); ActiveValueLabel.Hide(); } public void Show() { - Field.Box.Show(); + Field.Show(); Label.Show(); ActiveValueLabel.Show(); } -- cgit v1.2.3 From 05c7094a93c7d29eb8ac05247110995574a7b963 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 16 Sep 2020 01:20:23 -0700 Subject: Unsure if I will use this --- grapher/Models/Options/ApplyOptions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs index 241fe50..6ec9d31 100644 --- a/grapher/Models/Options/ApplyOptions.cs +++ b/grapher/Models/Options/ApplyOptions.cs @@ -227,7 +227,7 @@ namespace grapher.Models.Options private void SetActiveTitlesWhole() { OptionSetX.ActiveValuesTitle.Left = OptionSetX.Options.Left + OptionSetX.Options.Width; - LockXYLabel.Width = (AccelCharts.SensitivityChart.Left - OptionSetX.ActiveValuesTitle.Left) / 2; + LockXYLabel.Width = (AccelCharts.Left - OptionSetX.ActiveValuesTitle.Left) / 2; OptionSetX.ActiveValuesTitle.Width = LockXYLabel.Width; LockXYLabel.Left = OptionSetX.ActiveValuesTitle.Left + OptionSetX.ActiveValuesTitle.Width; Sensitivity.Fields.LockCheckBox.Left = LockXYLabel.Left + LockXYLabel.Width / 2 - Sensitivity.Fields.LockCheckBox.Width / 2; -- cgit v1.2.3 From 7a572b68825c270a4c0c024c0870367793e06913 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 16 Sep 2020 19:11:18 -0700 Subject: Fix cap options, fix power style labels --- grapher/Models/Options/CapOptions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs index 5e47d7b..05a6181 100644 --- a/grapher/Models/Options/CapOptions.cs +++ b/grapher/Models/Options/CapOptions.cs @@ -194,7 +194,7 @@ namespace grapher void OnSensitivityCapCheckedChange(object sender, EventArgs e) { - if (LegacyCapCheck.Checked == true) + if (LegacyCapCheck.Checked) { EnableSensitivityCap(); } @@ -202,7 +202,7 @@ namespace grapher void OnVelocityGainCapCheckedChange(object sender, EventArgs e) { - if (LegacyCapCheck.Checked == true) + if (VelocityGainCapCheck.Checked) { EnableVelocityGainCap(); } -- cgit v1.2.3 From ab90c152742acd9e5abd8542f0660d54aff6bf16 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 16 Sep 2020 20:12:15 -0700 Subject: Fix cap options pt 2 --- grapher/Models/Options/CapOptions.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grapher/Models/Options') diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs index 05a6181..c459c50 100644 --- a/grapher/Models/Options/CapOptions.cs +++ b/grapher/Models/Options/CapOptions.cs @@ -156,16 +156,16 @@ namespace grapher CapOption.ActiveValueLabel.FormatString = Constants.GainCapFormatString; CapOption.ActiveValueLabel.Prefix = "Gain"; CapOption.SetActiveValue(gainCap); - LegacyCapCheck.Checked = true; - VelocityGainCapCheck.Checked = false; + LegacyCapCheck.Checked = false; + VelocityGainCapCheck.Checked = true; } else { CapOption.ActiveValueLabel.FormatString = Constants.DefaultActiveValueFormatString; CapOption.ActiveValueLabel.Prefix = string.Empty; CapOption.SetActiveValue(sensCap); - LegacyCapCheck.Checked = false; - VelocityGainCapCheck.Checked = true; + LegacyCapCheck.Checked = true; + VelocityGainCapCheck.Checked = false; } } -- cgit v1.2.3