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/Layouts/DefaultLayout.cs | 1 + grapher/Layouts/ExperimentOneLayout.cs | 1 + grapher/Layouts/LayoutBase.cs | 7 +++++-- grapher/Layouts/LinearLayout.cs | 1 + grapher/Layouts/LogarithmLayout.cs | 1 + grapher/Layouts/NaturalGainLayout.cs | 1 + grapher/Layouts/NaturalLayout.cs | 1 + grapher/Layouts/OffLayout.cs | 1 + grapher/Layouts/PowerLayout.cs | 1 + grapher/Layouts/SigmoidGainLayout.cs | 1 + 10 files changed, 14 insertions(+), 2 deletions(-) (limited to 'grapher/Layouts') diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs index 83535c2..cf6f87f 100644 --- a/grapher/Layouts/DefaultLayout.cs +++ b/grapher/Layouts/DefaultLayout.cs @@ -10,6 +10,7 @@ namespace grapher.Layouts Name = "Default"; Index = (int)AccelMode.noaccel; ButtonEnabled = false; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(true, Cap); diff --git a/grapher/Layouts/ExperimentOneLayout.cs b/grapher/Layouts/ExperimentOneLayout.cs index 1853fbc..ad6f61a 100644 --- a/grapher/Layouts/ExperimentOneLayout.cs +++ b/grapher/Layouts/ExperimentOneLayout.cs @@ -14,6 +14,7 @@ namespace grapher.Layouts { Name = "Experiment 1"; Index = (int)AccelMode.experimentone; + LogarithmicCharts = true; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(false, string.Empty); diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 10429fb..b89e2f7 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -25,15 +25,18 @@ namespace grapher.Layouts MidpointLayout = new OptionLayout(false, string.Empty); ButtonEnabled = true; + 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; internal set; } + public int Index { get; protected set; } - public string Name { get; internal set; } + public string Name { get; protected set; } + + public bool LogarithmicCharts { get; protected set; } protected bool ButtonEnabled { get; set; } diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs index 8afdc79..e87c851 100644 --- a/grapher/Layouts/LinearLayout.cs +++ b/grapher/Layouts/LinearLayout.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts { Name = "Linear"; Index = (int)AccelMode.linear; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(true, Cap); diff --git a/grapher/Layouts/LogarithmLayout.cs b/grapher/Layouts/LogarithmLayout.cs index 5b25d60..e39dbe7 100644 --- a/grapher/Layouts/LogarithmLayout.cs +++ b/grapher/Layouts/LogarithmLayout.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts { Name = "Logarithm"; Index = (int)AccelMode.logarithm; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Scale); CapLayout = new OptionLayout(true, Cap); diff --git a/grapher/Layouts/NaturalGainLayout.cs b/grapher/Layouts/NaturalGainLayout.cs index dd2cc05..b9cf75e 100644 --- a/grapher/Layouts/NaturalGainLayout.cs +++ b/grapher/Layouts/NaturalGainLayout.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts { Name = "NaturalGain"; Index = (int)AccelMode.naturalgain; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(false, string.Empty); diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs index faa4730..59895df 100644 --- a/grapher/Layouts/NaturalLayout.cs +++ b/grapher/Layouts/NaturalLayout.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts { Name = "Natural"; Index = (int)AccelMode.natural; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(false, string.Empty); diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs index 85c8d3f..c47ea39 100644 --- a/grapher/Layouts/OffLayout.cs +++ b/grapher/Layouts/OffLayout.cs @@ -10,6 +10,7 @@ namespace grapher.Layouts Name = "Off"; Index = (int)AccelMode.noaccel; ButtonEnabled = true; + LogarithmicCharts = false; AccelLayout = new OptionLayout(false, string.Empty); CapLayout = new OptionLayout(false, string.Empty); diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs index 2004f23..5391506 100644 --- a/grapher/Layouts/PowerLayout.cs +++ b/grapher/Layouts/PowerLayout.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts { Name = "Power"; Index = (int)AccelMode.power; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(true, Cap); diff --git a/grapher/Layouts/SigmoidGainLayout.cs b/grapher/Layouts/SigmoidGainLayout.cs index c807439..684de83 100644 --- a/grapher/Layouts/SigmoidGainLayout.cs +++ b/grapher/Layouts/SigmoidGainLayout.cs @@ -9,6 +9,7 @@ namespace grapher.Layouts { Name = "SigmoidGain"; Index = (int)AccelMode.sigmoidgain; + LogarithmicCharts = false; AccelLayout = new OptionLayout(true, Acceleration); CapLayout = new OptionLayout(false, string.Empty); -- cgit v1.2.3