diff options
| author | JacobPalecki <[email protected]> | 2020-09-21 14:20:18 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-21 14:20:18 -0700 |
| commit | 4ec16a2ff35e0e910a13f92713d56d317b24e790 (patch) | |
| tree | c4aead24d52e3002cfd3282ddd697a3766de405a /grapher/Models/AccelGUIFactory.cs | |
| parent | Merge pull request #20 from JacobPalecki/GUI (diff) | |
| parent | x/y diff sens works (diff) | |
| download | rawaccel-4ec16a2ff35e0e910a13f92713d56d317b24e790.tar.xz rawaccel-4ec16a2ff35e0e910a13f92713d56d317b24e790.zip | |
Merge pull request #21 from JacobPalecki/GUI
GUI: Icon, Separate X/Y sens mode, some fixes
Diffstat (limited to 'grapher/Models/AccelGUIFactory.cs')
| -rw-r--r-- | grapher/Models/AccelGUIFactory.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 42a7b83..eb30864 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -89,14 +89,19 @@ namespace grapher.Models Label optionSetYTitle, Label mouseLabel) { + var accelCalculator = new AccelCalculator( + new Field(dpiTextBox.TextBox, form, Constants.DefaultDPI), + new Field(pollRateTextBox.TextBox, form, Constants.DefaultPollRate)); + var accelCharts = new AccelCharts( form, - new ChartXY(accelerationChart, accelerationChartY), - new ChartXY(velocityChart, velocityChartY), - new ChartXY(gainChart, gainChartY), + new ChartXY(accelerationChart, accelerationChartY, Constants.SensitivityChartTitle), + new ChartXY(velocityChart, velocityChartY, Constants.VelocityChartTitle), + new ChartXY(gainChart, gainChartY, Constants.GainChartTitle), showVelocityGainToolStripMenuItem, showLastMouseMoveMenuItem, - writeButton); + writeButton, + accelCalculator); var sensitivity = new OptionXY( sensitivityBoxX, @@ -212,7 +217,7 @@ namespace grapher.Models var midpointX = new Option( new Field(midpointBoxX, form, 0), constantThreeLabelX, - new ActiveValueLabel(midpointActiveLabelX, activeValueTitleY), + new ActiveValueLabel(midpointActiveLabelX, activeValueTitleX), 0); var midpointY = new Option( @@ -276,10 +281,6 @@ namespace grapher.Models lockXYLabel, accelCharts); - var accelCalculator = new AccelCalculator( - new Field(dpiTextBox.TextBox, form, Constants.DefaultDPI), - new Field(pollRateTextBox.TextBox, form, Constants.DefaultPollRate)); - var settings = new SettingsManager( activeAccel, accelCalculator.DPI, |