From 069bf5795fbf127d2a8c3233988a77aa7b2107d7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 4 Apr 2021 23:14:39 -0700 Subject: Fix most errors from wrapper rewrite --- grapher/Form1.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 51f1355..120bced 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -51,7 +51,7 @@ namespace grapher AccelGUI = AccelGUIFactory.Construct( this, - ManagedAccel.GetActiveAccel(), + ManagedAccel.GetActive(), AccelerationChart, AccelerationChartY, VelocityChart, -- cgit v1.2.3 From 54a6f02eec23758b7f73fbf0affdedb6c4e046b7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 4 Apr 2021 23:18:23 -0700 Subject: Fix two more errors, add LUT layout --- grapher/Form1.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 120bced..12fc9ff 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -33,9 +33,9 @@ namespace grapher try { - driverVersion = VersionHelper.ValidateAndGetDriverVersion(assemVersion); + driverVersion = VersionHelper.ValidOrThrow(); } - catch (VersionException ex) + catch (InteropException ex) { MessageBox.Show(ex.Message); throw; -- cgit v1.2.3 From cf1fdf2e6cdba8c6ae8493eb744f223b6324594c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 20:43:08 -0700 Subject: LUT text layout --- grapher/Form1.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 12fc9ff..5b13c8f 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -120,6 +120,7 @@ namespace grapher limitLabelY, expLabelX, expLabelY, + LUTTextLabel, constantThreeLabelX, constantThreeLabelY, ActiveValueTitle, -- cgit v1.2.3 From 7c1f14845bc948e9ea25908e96099203d9433a69 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 6 Apr 2021 01:21:42 -0400 Subject: update wrapper + writer to handle lut grapher is building but applying options still broken for the most part --- grapher/Form1.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 5b13c8f..a4ece9e 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -28,7 +28,6 @@ namespace grapher { InitializeComponent(); - Version assemVersion = typeof(RawAcceleration).Assembly.GetName().Version; Version driverVersion = null; try -- cgit v1.2.3 From db593584edb93b053396259db4c4acbeee0ee9e6 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 22:41:16 -0700 Subject: LUT GUI fixes --- grapher/Form1.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index a4ece9e..6ed9c46 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -119,7 +119,8 @@ namespace grapher limitLabelY, expLabelX, expLabelY, - LUTTextLabel, + LUTTextLabelX, + LUTTextLabelY, constantThreeLabelX, constantThreeLabelY, ActiveValueTitle, -- cgit v1.2.3 From 019665015ab30893209ab49fea352405b144f0f8 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 23:36:26 -0700 Subject: Add gain switch --- grapher/Form1.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 6ed9c46..5d0b805 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -102,6 +102,8 @@ namespace grapher FakeBox, WholeCheckBox, ByComponentCheckBox, + gainSwitchX, + gainSwitchY, LockXYLabel, sensitivityLabel, rotationLabel, -- cgit v1.2.3 From 5b519e7f8614953263d3c47690ecec0b8f07eb17 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 6 Apr 2021 17:55:57 -0700 Subject: Remove cap and offset style switches --- grapher/Form1.cs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 5d0b805..c7c2723 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -63,10 +63,6 @@ namespace grapher toggleButton, showVelocityGainToolStripMenuItem, showLastMouseMoveToolStripMenuItem, - gainCapToolStripMenuItem, - legacyCapToolStripMenuItem, - gainOffsetToolStripMenuItem, - legacyOffsetToolStripMenuItem, AutoWriteMenuItem, UseSpecificDeviceMenuItem, ScaleMenuItem, -- cgit v1.2.3 From 5e858b059436375ed1c17f7dc1b3e47a7e8e1d5d Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 7 Apr 2021 01:05:59 -0700 Subject: Add active value labels for gain switch --- grapher/Form1.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index c7c2723..7b21036 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -144,6 +144,8 @@ namespace grapher MidpointActiveYLabel, AccelTypeActiveLabelX, AccelTypeActiveLabelY, + gainSwitchActiveLabelX, + gainSwitchActiveLabelY, OptionSetXTitle, OptionSetYTitle, MouseLabel, -- cgit v1.2.3 From 0cf5ce3762926fa556418572e9661d79cbbaa240 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 25 Apr 2021 23:05:44 -0700 Subject: Start of LUT points editing --- grapher/Form1.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 7b21036..2b2ad42 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -100,6 +100,8 @@ namespace grapher ByComponentCheckBox, gainSwitchX, gainSwitchY, + LUTPanelX, + LUTPanelY, LockXYLabel, sensitivityLabel, rotationLabel, -- cgit v1.2.3 From dc76635349577f9dd95ab347fb79652dad2abb30 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 30 Jun 2021 23:52:31 -0700 Subject: Better-written LUT panels --- grapher/Form1.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 2b2ad42..113fc4d 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -59,6 +59,8 @@ namespace grapher GainChartY, accelTypeDropX, accelTypeDropY, + XLutApplyDropdown, + YLutApplyDropdown, writeButton, toggleButton, showVelocityGainToolStripMenuItem, @@ -102,6 +104,8 @@ namespace grapher gainSwitchY, LUTPanelX, LUTPanelY, + XLutPointsBox, + YLutPointsBox, LockXYLabel, sensitivityLabel, rotationLabel, @@ -162,7 +166,11 @@ namespace grapher DomainActiveValueY, DirectionalityRangeLabel, RangeActiveValueX, - RangeActiveValueY); + RangeActiveValueY, + XLutApplyLabel, + YLutApplyLabel, + LutApplyActiveXLabel, + LutApplyActiveYLabel); ResizeAndCenter(); } -- cgit v1.2.3 From ac0a6eb86c8d783c21cb246d688a221913b15789 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 1 Jul 2021 19:13:12 -0700 Subject: Mostly working --- grapher/Form1.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 113fc4d..a7a878b 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -102,8 +102,8 @@ namespace grapher ByComponentCheckBox, gainSwitchX, gainSwitchY, - LUTPanelX, - LUTPanelY, + XLutActiveValuesBox, + YLutActiveValuesBox, XLutPointsBox, YLutPointsBox, LockXYLabel, -- cgit v1.2.3 From 2f8fd23779dce8d173193f4c9dcf9fa1bf97a0f0 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 6 Jul 2021 16:42:22 -0400 Subject: fix double error message on gui version check --- grapher/Form1.cs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 3971322..fa0b03a 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -28,18 +28,8 @@ namespace grapher { InitializeComponent(); - Version driverVersion = null; + Version driverVersion = VersionHelper.ValidOrThrow(); - try - { - driverVersion = VersionHelper.ValidOrThrow(); - } - catch (InteropException ex) - { - MessageBox.Show(ex.Message); - throw; - } - ToolStripMenuItem HelpMenuItem = new ToolStripMenuItem("&Help"); HelpMenuItem.DropDownItems.AddRange(new ToolStripItem[] { -- cgit v1.2.3 From b798fe074a2ff6c6498bfef3be1dc3e1a1b03e0c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 9 Jul 2021 17:08:00 -0700 Subject: Add separate box for power in classic mode --- grapher/Form1.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index fa0b03a..a9a18fb 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -77,6 +77,8 @@ namespace grapher scaleBoxY, limitBoxX, limitBoxY, + powerBoxX, + powerBoxY, expBoxX, expBoxY, midpointBoxX, @@ -112,6 +114,8 @@ namespace grapher scaleLabelY, limitLabelX, limitLabelY, + powerLabelX, + powerLabelY, expLabelX, expLabelY, LUTTextLabelX, @@ -135,6 +139,8 @@ namespace grapher ScaleActiveYLabel, LimitActiveXLabel, LimitActiveYLabel, + PowerClassicActiveXLabel, + PowerClassicActiveYLabel, ExpActiveXLabel, ExpActiveYLabel, MidpointActiveXLabel, -- cgit v1.2.3 From aa04d5a61f89225a03dc3b155d4f3a93ffe4c5b8 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sat, 10 Jul 2021 15:35:21 -0700 Subject: Fixed default values by splitting into unique text boxes --- grapher/Form1.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'grapher/Form1.cs') diff --git a/grapher/Form1.cs b/grapher/Form1.cs index a9a18fb..ba16a23 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -73,6 +73,12 @@ namespace grapher offsetBoxY, accelerationBoxX, accelerationBoxY, + decayRateBoxX, + decayRateBoxY, + growthRateBoxX, + growthRateBoxY, + smoothBoxX, + smoothBoxY, scaleBoxX, scaleBoxY, limitBoxX, @@ -110,6 +116,12 @@ namespace grapher offsetLabelY, constantOneLabelX, constantOneLabelY, + decayRateLabelX, + decayRateLabelY, + growthRateLabelX, + growthRateLabelY, + smoothLabelX, + smoothLabelY, scaleLabelX, scaleLabelY, limitLabelX, @@ -135,6 +147,12 @@ namespace grapher OffsetActiveYLabel, AccelerationActiveLabelX, AccelerationActiveLabelY, + DecayRateActiveXLabel, + DecayRateActiveYLabel, + GrowthRateActiveXLabel, + GrowthRateActiveYLabel, + SmoothActiveXLabel, + SmoothActiveYLabel, ScaleActiveXLabel, ScaleActiveYLabel, LimitActiveXLabel, -- cgit v1.2.3