From 297d610ca1f2978c6e354c679cbed4e1908be743 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 1 Sep 2020 00:31:18 -0700 Subject: Set whole or by component with toolstrip item --- grapher/Models/AccelGUI.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index a15dba8..7789337 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -1,5 +1,6 @@ using grapher.Models.Calculations; using grapher.Models.Mouse; +using grapher.Models.Options; using grapher.Models.Serialized; using System; using System.CodeDom; @@ -23,6 +24,7 @@ namespace grapher AccelCalculator accelCalculator, AccelCharts accelCharts, SettingsManager settings, + ApplyOptions applyOptions, AccelOptions accelOptions, OptionXY sensitivity, Option rotation, @@ -41,6 +43,7 @@ namespace grapher AccelCalculator = accelCalculator; AccelCharts = accelCharts; AccelerationOptions = accelOptions; + ApplyOptions = applyOptions; Sensitivity = sensitivity; Rotation = rotation; Weight = weight; @@ -72,6 +75,8 @@ namespace grapher public SettingsManager Settings { get; } + public ApplyOptions ApplyOptions { get; } + public AccelOptions AccelerationOptions { get; } public OptionXY Sensitivity { get; } @@ -110,7 +115,7 @@ namespace grapher x = Sensitivity.Fields.X, y = Sensitivity.Fields.Y }, - combineMagnitudes = true, + combineMagnitudes = ApplyOptions.IsWhole, modes = new Vec2 { x = (AccelMode)AccelerationOptions.AccelerationIndex @@ -159,6 +164,7 @@ namespace grapher Acceleration.SetActiveValue(settings.args.x.accel); // rate, powerscale LimitOrExponent.SetActiveValue(settings.args.x.limit); //exp, powerexp Midpoint.SetActiveValue(settings.args.x.midpoint); + ApplyOptions.SetActive(settings.combineMagnitudes); //Cap.SetActiveValues(Settings.ActiveAccel.GainCap, Settings.ActiveAccel.CapX, Settings.ActiveAccel.CapY, Settings.ActiveAccel.GainCapEnabled); } -- cgit v1.2.3 From b5b87e24053c9f52a2edb5b1cb48f8e27e434ce1 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 1 Sep 2020 00:56:07 -0700 Subject: Show xy charts only when accel applied by component --- grapher/Models/AccelGUI.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 7789337..a26f13d 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -149,10 +149,10 @@ namespace grapher Settings.ActiveAccel, Settings.RawAccelSettings.AccelerationSettings); AccelCharts.Bind(); - UpdateActiveValueLabels(); + UpdateShownActiveValues(); } - public void UpdateActiveValueLabels() + public void UpdateShownActiveValues() { var settings = Settings.RawAccelSettings.AccelerationSettings; @@ -165,7 +165,9 @@ namespace grapher LimitOrExponent.SetActiveValue(settings.args.x.limit); //exp, powerexp Midpoint.SetActiveValue(settings.args.x.midpoint); ApplyOptions.SetActive(settings.combineMagnitudes); - //Cap.SetActiveValues(Settings.ActiveAccel.GainCap, Settings.ActiveAccel.CapX, Settings.ActiveAccel.CapY, Settings.ActiveAccel.GainCapEnabled); + Cap.SetActiveValues(settings.args.x.gainCap, settings.args.x.scaleCap, settings.args.y.scaleCap, settings.args.x.gainCap > 0); + + AccelCharts.RefreshXY(settings.combineMagnitudes); } private void OnScaleMenuItemClick(object sender, EventArgs e) -- cgit v1.2.3 From 246fb772c5bf7dd6a85143fadebece3b4d9f1e04 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 1 Sep 2020 02:18:41 -0700 Subject: Add constants class and separate classes into regions --- grapher/Models/AccelGUI.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index a26f13d..8fe752c 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -17,7 +17,7 @@ namespace grapher public class AccelGUI { - #region constructors + #region Constructors public AccelGUI( RawAcceleration accelForm, @@ -63,9 +63,9 @@ namespace grapher ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick); } - #endregion constructors + #endregion Constructors - #region properties + #region Properties public RawAcceleration AccelForm { get; } @@ -101,9 +101,9 @@ namespace grapher public ToolStripMenuItem ScaleMenuItem { get; } - #endregion properties + #endregion Properties - #region methods + #region Methods public void UpdateActiveSettingsFromFields() { @@ -174,7 +174,8 @@ namespace grapher { UpdateGraph(); } - #endregion methods + + #endregion Methods } } -- cgit v1.2.3 From fa497a2a20b02b4a44690d55ffa1cac26bafe35f Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 1 Sep 2020 03:15:45 -0700 Subject: Add factory to create AccelGUI --- grapher/Models/AccelGUI.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 8fe752c..b9a578f 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -36,8 +36,7 @@ namespace grapher Option midpoint, Button writeButton, Label mouseMoveLabel, - ToolStripMenuItem scaleMenuItem, - ToolStripMenuItem autoWriteMenuItem) + ToolStripMenuItem scaleMenuItem) { AccelForm = accelForm; AccelCalculator = accelCalculator; -- cgit v1.2.3 From 95cc3ed0a0bf66f5535b873f245bc1c35a145478 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 1 Sep 2020 21:45:42 -0700 Subject: intermittent commit - large commit halfway done --- grapher/Models/AccelGUI.cs | 69 ++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 51 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index b9a578f..5ea3595 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -25,15 +25,10 @@ namespace grapher AccelCharts accelCharts, SettingsManager settings, ApplyOptions applyOptions, - AccelOptions accelOptions, OptionXY sensitivity, Option rotation, - OptionXY weight, - CapOptions cap, - Option offset, - Option acceleration, - Option limtOrExp, - Option midpoint, + AccelOptionSet optionSetX, + AccelOptionSet optionSetY, Button writeButton, Label mouseMoveLabel, ToolStripMenuItem scaleMenuItem) @@ -41,21 +36,14 @@ namespace grapher AccelForm = accelForm; AccelCalculator = accelCalculator; AccelCharts = accelCharts; - AccelerationOptions = accelOptions; ApplyOptions = applyOptions; Sensitivity = sensitivity; Rotation = rotation; - Weight = weight; - Cap = cap; - Offset = offset; - Acceleration = acceleration; - LimitOrExponent = limtOrExp; - Midpoint = midpoint; WriteButton = writeButton; ScaleMenuItem = scaleMenuItem; Settings = settings; Settings.Startup(); - UpdateGraph(); + RefreshOnRead(); MouseWatcher = new MouseWatcher(AccelForm, mouseMoveLabel, AccelCharts); @@ -76,23 +64,13 @@ namespace grapher public ApplyOptions ApplyOptions { get; } - public AccelOptions AccelerationOptions { get; } - public OptionXY Sensitivity { get; } public Option Rotation { get; } - public OptionXY Weight { get; } - - public CapOptions Cap { get; } - - public Option Offset { get; } - - public Option Acceleration { get; } - - public Option LimitOrExponent { get; } + public AccelOptionSet OptionSetX { get; } - public Option Midpoint { get; } + public AccelOptionSet OptionSetY { get; } public Button WriteButton { get; } @@ -117,28 +95,23 @@ namespace grapher combineMagnitudes = ApplyOptions.IsWhole, modes = new Vec2 { - x = (AccelMode)AccelerationOptions.AccelerationIndex + x = (AccelMode)OptionSetX.AccelTypeOptions.AccelerationIndex, + y = (AccelMode)OptionSetY.AccelTypeOptions.AccelerationIndex }, args = new Vec2 { - x = new AccelArgs - { - offset = Offset.Field.Data, - weight = Weight.Fields.X, - gainCap = Cap.VelocityGainCap, - scaleCap = Cap.SensitivityCapX, - accel = Acceleration.Field.Data, - rate = Acceleration.Field.Data, - powerScale = Acceleration.Field.Data, - limit = LimitOrExponent.Field.Data, - exponent = LimitOrExponent.Field.Data, - powerExponent = LimitOrExponent.Field.Data, - midpoint = Midpoint.Field.Data - } + x = OptionSetX.GenerateArgs(), + y = OptionSetY.GenerateArgs() }, minimumTime = .4 }); + RefreshOnRead(); + } + + public void RefreshOnRead() + { UpdateGraph(); + UpdateShownActiveValues(); } public void UpdateGraph() @@ -148,23 +121,17 @@ namespace grapher Settings.ActiveAccel, Settings.RawAccelSettings.AccelerationSettings); AccelCharts.Bind(); - UpdateShownActiveValues(); } public void UpdateShownActiveValues() { var settings = Settings.RawAccelSettings.AccelerationSettings; - + Sensitivity.SetActiveValues(settings.sensitivity.x, settings.sensitivity.y); Rotation.SetActiveValue(settings.rotation); - AccelerationOptions.SetActiveValue((int)settings.modes.x); - Offset.SetActiveValue(settings.args.x.offset); - Weight.SetActiveValues(settings.args.x.weight, settings.args.x.weight); - Acceleration.SetActiveValue(settings.args.x.accel); // rate, powerscale - LimitOrExponent.SetActiveValue(settings.args.x.limit); //exp, powerexp - Midpoint.SetActiveValue(settings.args.x.midpoint); ApplyOptions.SetActive(settings.combineMagnitudes); - Cap.SetActiveValues(settings.args.x.gainCap, settings.args.x.scaleCap, settings.args.y.scaleCap, settings.args.x.gainCap > 0); + OptionSetX.SetActiveValues((int)settings.modes.x, settings.args.x); + OptionSetY.SetActiveValues((int)settings.modes.y, settings.args.y); AccelCharts.RefreshXY(settings.combineMagnitudes); } -- cgit v1.2.3 From 26130b21dabaab7fc331844df11465623a811197 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 1 Sep 2020 22:42:07 -0700 Subject: Second half - the parts in place --- grapher/Models/AccelGUI.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 5ea3595..891cd01 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -42,6 +42,8 @@ namespace grapher WriteButton = writeButton; ScaleMenuItem = scaleMenuItem; Settings = settings; + OptionSetX = optionSetX; + OptionSetY = optionSetY; Settings.Startup(); RefreshOnRead(); -- cgit v1.2.3 From 5b9b8ed308e7a8cefbd27b2db72d33d7b002e223 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 2 Sep 2020 01:02:51 -0700 Subject: Move optionsets to applyoptions --- grapher/Models/AccelGUI.cs | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 891cd01..6b14672 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -27,8 +27,6 @@ namespace grapher ApplyOptions applyOptions, OptionXY sensitivity, Option rotation, - AccelOptionSet optionSetX, - AccelOptionSet optionSetY, Button writeButton, Label mouseMoveLabel, ToolStripMenuItem scaleMenuItem) @@ -42,8 +40,6 @@ namespace grapher WriteButton = writeButton; ScaleMenuItem = scaleMenuItem; Settings = settings; - OptionSetX = optionSetX; - OptionSetY = optionSetY; Settings.Startup(); RefreshOnRead(); @@ -70,10 +66,6 @@ namespace grapher public Option Rotation { get; } - public AccelOptionSet OptionSetX { get; } - - public AccelOptionSet OptionSetY { get; } - public Button WriteButton { get; } public MouseWatcher MouseWatcher { get; } @@ -95,16 +87,8 @@ namespace grapher y = Sensitivity.Fields.Y }, combineMagnitudes = ApplyOptions.IsWhole, - modes = new Vec2 - { - x = (AccelMode)OptionSetX.AccelTypeOptions.AccelerationIndex, - y = (AccelMode)OptionSetY.AccelTypeOptions.AccelerationIndex - }, - args = new Vec2 - { - x = OptionSetX.GenerateArgs(), - y = OptionSetY.GenerateArgs() - }, + modes = ApplyOptions.GetModes(), + args = ApplyOptions.GetArgs(), minimumTime = .4 }); RefreshOnRead(); @@ -131,9 +115,7 @@ namespace grapher Sensitivity.SetActiveValues(settings.sensitivity.x, settings.sensitivity.y); Rotation.SetActiveValue(settings.rotation); - ApplyOptions.SetActive(settings.combineMagnitudes); - OptionSetX.SetActiveValues((int)settings.modes.x, settings.args.x); - OptionSetY.SetActiveValues((int)settings.modes.y, settings.args.y); + ApplyOptions.SetActiveValues(settings); AccelCharts.RefreshXY(settings.combineMagnitudes); } -- cgit v1.2.3 From 66131ff0e469aed0a44ad0fa7179b9cddfb66df5 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 2 Sep 2020 01:39:36 -0700 Subject: The menus mostly work --- grapher/Models/AccelGUI.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 6b14672..3a15d48 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -96,6 +96,7 @@ namespace grapher public void RefreshOnRead() { + AccelCharts.RefreshXY(Settings.RawAccelSettings.AccelerationSettings.combineMagnitudes); UpdateGraph(); UpdateShownActiveValues(); } @@ -117,7 +118,6 @@ namespace grapher Rotation.SetActiveValue(settings.rotation); ApplyOptions.SetActiveValues(settings); - AccelCharts.RefreshXY(settings.combineMagnitudes); } private void OnScaleMenuItemClick(object sender, EventArgs e) -- cgit v1.2.3 From f2322540dd904474587ddebfa8d96dc66a902530 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 8 Sep 2020 00:51:05 -0700 Subject: Alignment for whole mode works --- grapher/Models/AccelGUI.cs | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index e9e925f..36938b6 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -25,8 +25,6 @@ namespace grapher AccelCharts accelCharts, SettingsManager settings, ApplyOptions applyOptions, - OptionXY sensitivity, - Option rotation, Button writeButton, Label mouseMoveLabel, ToolStripMenuItem scaleMenuItem) @@ -35,8 +33,6 @@ namespace grapher AccelCalculator = accelCalculator; AccelCharts = accelCharts; ApplyOptions = applyOptions; - Sensitivity = sensitivity; - Rotation = rotation; WriteButton = writeButton; ScaleMenuItem = scaleMenuItem; Settings = settings; @@ -62,10 +58,6 @@ namespace grapher public ApplyOptions ApplyOptions { get; } - public OptionXY Sensitivity { get; } - - public Option Rotation { get; } - public Button WriteButton { get; } public MouseWatcher MouseWatcher { get; } @@ -80,11 +72,11 @@ namespace grapher { var settings = new DriverSettings { - rotation = Rotation.Field.Data, + rotation = ApplyOptions.Rotation.Field.Data, sensitivity = new Vec2 { - x = Sensitivity.Fields.X, - y = Sensitivity.Fields.Y + x = ApplyOptions.Sensitivity.Fields.X, + y = ApplyOptions.Sensitivity.Fields.Y }, combineMagnitudes = ApplyOptions.IsWhole, modes = ApplyOptions.GetModes(), @@ -120,11 +112,7 @@ namespace grapher public void UpdateShownActiveValues() { - var settings = Settings.RawAccelSettings.AccelerationSettings; - - Sensitivity.SetActiveValues(settings.sensitivity.x, settings.sensitivity.y); - Rotation.SetActiveValue(settings.rotation); - ApplyOptions.SetActiveValues(settings); + ApplyOptions.SetActiveValues(Settings.RawAccelSettings.AccelerationSettings); } private void OnScaleMenuItemClick(object sender, EventArgs e) -- cgit v1.2.3 From 9502dcf7608475857b1487375997d20a9d29622e Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 8 Sep 2020 01:26:22 -0700 Subject: Remove and sort usings en masse --- grapher/Models/AccelGUI.cs | 7 ------- 1 file changed, 7 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 36938b6..634aabf 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -3,14 +3,7 @@ using grapher.Models.Mouse; using grapher.Models.Options; using grapher.Models.Serialized; using System; -using System.CodeDom; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Windows.Forms.DataVisualization.Charting; namespace grapher { -- cgit v1.2.3 From d31ef3c66c9919d3520ee34db062687a84bc5fa4 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 8 Sep 2020 14:01:33 -0700 Subject: Add delay on button enable after writing to driver --- grapher/Models/AccelGUI.cs | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index 634aabf..a7fe5f9 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -35,6 +35,14 @@ namespace grapher MouseWatcher = new MouseWatcher(AccelForm, mouseMoveLabel, AccelCharts); ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick); + WriteButton.Click += new System.EventHandler(OnWriteButtonClick); + + ButtonTimer = new Timer(); + ButtonTimer.Enabled = true; + ButtonTimer.Interval = Convert.ToInt32(ManagedAccel.WriteDelay); + ButtonTimer.Tick += new System.EventHandler(OnButtonTimerTick); + + SetWriteButtonDefault(); } #endregion Constructors @@ -53,6 +61,8 @@ namespace grapher public Button WriteButton { get; } + public Timer ButtonTimer { get; } + public MouseWatcher MouseWatcher { get; } public ToolStripMenuItem ScaleMenuItem { get; } @@ -81,6 +91,7 @@ namespace grapher { AccelForm.Invoke((MethodInvoker)delegate { + WriteButtonDelay(); UpdateGraph(); }); }); @@ -113,6 +124,35 @@ namespace grapher UpdateGraph(); } + private void OnWriteButtonClick(object sender, EventArgs e) + { + UpdateActiveSettingsFromFields(); + } + + private void OnButtonTimerTick(object sender, EventArgs e) + { + ButtonTimer.Stop(); + SetWriteButtonDefault(); + } + + private void WriteButtonDelay() + { + SetWriteButtonDelay(); + ButtonTimer.Start(); + } + + private void SetWriteButtonDefault() + { + WriteButton.Text = Constants.WriteButtonDefaultText; + WriteButton.Enabled = true; + } + + private void SetWriteButtonDelay() + { + WriteButton.Enabled = false; + WriteButton.Text = $"{Constants.WriteButtonDelayText} : {ButtonTimer.Interval} ms"; + } + #endregion Methods } -- cgit v1.2.3 From 79bb4f0bc1d72c36767ff73825b7f70db9615928 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 8 Sep 2020 14:21:22 -0700 Subject: Set WriteButton vertical placement --- grapher/Models/AccelGUI.cs | 47 ++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index a7fe5f9..c150393 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -37,12 +37,8 @@ namespace grapher ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick); WriteButton.Click += new System.EventHandler(OnWriteButtonClick); - ButtonTimer = new Timer(); - ButtonTimer.Enabled = true; - ButtonTimer.Interval = Convert.ToInt32(ManagedAccel.WriteDelay); - ButtonTimer.Tick += new System.EventHandler(OnButtonTimerTick); - - SetWriteButtonDefault(); + ButtonTimer = SetupButtonTimer(); + SetupWriteButton(); } #endregion Constructors @@ -119,6 +115,33 @@ namespace grapher ApplyOptions.SetActiveValues(Settings.RawAccelSettings.AccelerationSettings); } + private Timer SetupButtonTimer() + { + Timer buttonTimer = new Timer(); + buttonTimer.Enabled = true; + buttonTimer.Interval = Convert.ToInt32(ManagedAccel.WriteDelay); + buttonTimer.Tick += new System.EventHandler(OnButtonTimerTick); + return buttonTimer; + } + + private void SetupWriteButton() + { + WriteButton.Top = AccelCharts.SensitivityChart.Top + AccelCharts.SensitivityChart.Height - Constants.WriteButtonVerticalOffset; + SetWriteButtonDefault(); + } + + private void SetWriteButtonDefault() + { + WriteButton.Text = Constants.WriteButtonDefaultText; + WriteButton.Enabled = true; + } + + private void SetWriteButtonDelay() + { + WriteButton.Enabled = false; + WriteButton.Text = $"{Constants.WriteButtonDelayText} : {ButtonTimer.Interval} ms"; + } + private void OnScaleMenuItemClick(object sender, EventArgs e) { UpdateGraph(); @@ -141,18 +164,6 @@ namespace grapher ButtonTimer.Start(); } - private void SetWriteButtonDefault() - { - WriteButton.Text = Constants.WriteButtonDefaultText; - WriteButton.Enabled = true; - } - - private void SetWriteButtonDelay() - { - WriteButton.Enabled = false; - WriteButton.Text = $"{Constants.WriteButtonDelayText} : {ButtonTimer.Interval} ms"; - } - #endregion Methods } -- cgit v1.2.3 From b8a8eb8a70cf71c61e5dc851229a83027f43194d Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 8 Sep 2020 15:20:31 -0700 Subject: By component, anisotropy full works --- grapher/Models/AccelGUI.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'grapher/Models/AccelGUI.cs') diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index c150393..3acb943 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -96,7 +96,6 @@ namespace grapher public void RefreshOnRead() { - AccelCharts.RefreshXY(Settings.RawAccelSettings.AccelerationSettings.combineMagnitudes); UpdateGraph(); UpdateShownActiveValues(); } @@ -112,7 +111,10 @@ namespace grapher public void UpdateShownActiveValues() { - ApplyOptions.SetActiveValues(Settings.RawAccelSettings.AccelerationSettings); + var settings = Settings.RawAccelSettings.AccelerationSettings; + + AccelCharts.ShowActive(settings); + ApplyOptions.SetActiveValues(settings); } private Timer SetupButtonTimer() -- cgit v1.2.3