diff options
| author | a1xd <[email protected]> | 2021-07-05 23:33:41 -0400 |
|---|---|---|
| committer | a1xd <[email protected]> | 2021-07-05 23:33:41 -0400 |
| commit | 31efc792f5895d7ef3533390875de3c480add996 (patch) | |
| tree | 8db5b16a88f50448cb525ba8ae56801985294f63 /grapher/Form1.cs | |
| parent | Merge pull request #87 from matthewstrasiotto/streamer_mode (diff) | |
| parent | Handle power\exponent correctly in GUI (diff) | |
| download | rawaccel-31efc792f5895d7ef3533390875de3c480add996.tar.xz rawaccel-31efc792f5895d7ef3533390875de3c480add996.zip | |
merge lut2
Diffstat (limited to 'grapher/Form1.cs')
| -rw-r--r-- | grapher/Form1.cs | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/grapher/Form1.cs b/grapher/Form1.cs index d833311..3971322 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -28,14 +28,13 @@ namespace grapher { InitializeComponent(); - Version assemVersion = typeof(RawAcceleration).Assembly.GetName().Version; Version driverVersion = null; try { - driverVersion = VersionHelper.ValidateAndGetDriverVersion(assemVersion); + driverVersion = VersionHelper.ValidOrThrow(); } - catch (VersionException ex) + catch (InteropException ex) { MessageBox.Show(ex.Message); throw; @@ -51,7 +50,7 @@ namespace grapher AccelGUI = AccelGUIFactory.Construct( this, - ManagedAccel.GetActiveAccel(), + ManagedAccel.GetActive(), AccelerationChart, AccelerationChartY, VelocityChart, @@ -60,15 +59,13 @@ namespace grapher GainChartY, accelTypeDropX, accelTypeDropY, + XLutApplyDropdown, + YLutApplyDropdown, writeButton, toggleButton, showVelocityGainToolStripMenuItem, showLastMouseMoveToolStripMenuItem, streamingModeToolStripMenuItem, - gainCapToolStripMenuItem, - legacyCapToolStripMenuItem, - gainOffsetToolStripMenuItem, - legacyOffsetToolStripMenuItem, AutoWriteMenuItem, UseSpecificDeviceMenuItem, ScaleMenuItem, @@ -104,6 +101,12 @@ namespace grapher FakeBox, WholeCheckBox, ByComponentCheckBox, + gainSwitchX, + gainSwitchY, + XLutActiveValuesBox, + YLutActiveValuesBox, + XLutPointsBox, + YLutPointsBox, LockXYLabel, sensitivityLabel, rotationLabel, @@ -121,6 +124,8 @@ namespace grapher limitLabelY, expLabelX, expLabelY, + LUTTextLabelX, + LUTTextLabelY, constantThreeLabelX, constantThreeLabelY, ActiveValueTitle, @@ -146,6 +151,8 @@ namespace grapher MidpointActiveYLabel, AccelTypeActiveLabelX, AccelTypeActiveLabelY, + gainSwitchActiveLabelX, + gainSwitchActiveLabelY, OptionSetXTitle, OptionSetYTitle, MouseLabel, @@ -160,7 +167,11 @@ namespace grapher DomainActiveValueY, DirectionalityRangeLabel, RangeActiveValueX, - RangeActiveValueY); + RangeActiveValueY, + XLutApplyLabel, + YLutApplyLabel, + LutApplyActiveXLabel, + LutApplyActiveYLabel); ResizeAndCenter(); } |