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/Constants/Constants.cs | 5 ++++- grapher/Models/AccelGUI.cs | 47 ++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/grapher/Constants/Constants.cs b/grapher/Constants/Constants.cs index d74d045..aaf8bb9 100644 --- a/grapher/Constants/Constants.cs +++ b/grapher/Constants/Constants.cs @@ -51,14 +51,17 @@ namespace grapher /// Width of charts when widened public const int WideChartWidth = 723; - /// Width of charts when widened + /// Left placement of charts when widened public const int WideChartLeft = 333; /// Width of charts when narrowed public const int NarrowChartWidth = 698; + /// Left placement of charts when narrowed public const int NarrowChartLeft = 482; + public const int WriteButtonVerticalOffset = 50; + /// Format string for shortened x and y textboxes. public const string ShortenedFormatString = "0.###"; 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