From 8e58892723ee10792c7d3db275da826f98d01677 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 02:28:35 -0700 Subject: Mostly works --- grapher/Form1.Designer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 535ee15..46b7a9a 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -580,7 +580,7 @@ namespace grapher this.gainCapToolStripMenuItem, this.legacyCapToolStripMenuItem}); this.capStyleToolStripMenuItem.Name = "capStyleToolStripMenuItem"; - this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.capStyleToolStripMenuItem.Text = "Cap Style"; // // gainCapToolStripMenuItem @@ -603,7 +603,7 @@ namespace grapher this.gainOffsetToolStripMenuItem, this.legacyOffsetToolStripMenuItem}); this.offsetStyleToolStripMenuItem.Name = "offsetStyleToolStripMenuItem"; - this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.offsetStyleToolStripMenuItem.Text = "Offset Style"; // // gainOffsetToolStripMenuItem @@ -624,7 +624,7 @@ namespace grapher this.wholeVectorToolStripMenuItem, this.byVectorComponentToolStripMenuItem}); this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(163, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem1.Text = "Application Style"; // // wholeVectorToolStripMenuItem -- cgit v1.2.3 From 2c288f95f2c3791daf54299580e19439c3dd1b0c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 03:16:36 -0700 Subject: Fix bug & rename x axis to input speed --- grapher/Form1.Designer.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 46b7a9a..ecfb978 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -166,7 +166,7 @@ namespace grapher // // AccelerationChart // - chartArea1.AxisX.Title = "Speed (counts/ms)"; + chartArea1.AxisX.Title = "Input Speed (counts/ms)"; chartArea1.AxisY.Title = "Ratio of Output to Input"; chartArea1.Name = "ChartArea1"; this.AccelerationChart.ChartAreas.Add(chartArea1); @@ -400,7 +400,7 @@ namespace grapher // // VelocityChart // - chartArea2.AxisX.Title = "Speed (count/ms)"; + chartArea2.AxisX.Title = "Input Speed (count/ms)"; chartArea2.AxisY.Title = "Output Speed (counts/ms)"; chartArea2.Name = "ChartArea1"; this.VelocityChart.ChartAreas.Add(chartArea2); @@ -441,7 +441,7 @@ namespace grapher // // GainChart // - chartArea3.AxisX.Title = "Speed (counts/ms)"; + chartArea3.AxisX.Title = "Input Speed (counts/ms)"; chartArea3.AxisY.Title = "Slope of Velocity Chart"; chartArea3.Name = "ChartArea1"; this.GainChart.ChartAreas.Add(chartArea3); @@ -580,7 +580,7 @@ namespace grapher this.gainCapToolStripMenuItem, this.legacyCapToolStripMenuItem}); this.capStyleToolStripMenuItem.Name = "capStyleToolStripMenuItem"; - this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.capStyleToolStripMenuItem.Text = "Cap Style"; // // gainCapToolStripMenuItem @@ -603,7 +603,7 @@ namespace grapher this.gainOffsetToolStripMenuItem, this.legacyOffsetToolStripMenuItem}); this.offsetStyleToolStripMenuItem.Name = "offsetStyleToolStripMenuItem"; - this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.offsetStyleToolStripMenuItem.Text = "Offset Style"; // // gainOffsetToolStripMenuItem @@ -624,7 +624,7 @@ namespace grapher this.wholeVectorToolStripMenuItem, this.byVectorComponentToolStripMenuItem}); this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(163, 22); this.toolStripMenuItem1.Text = "Application Style"; // // wholeVectorToolStripMenuItem @@ -661,7 +661,7 @@ namespace grapher // // AccelerationChartY // - chartArea4.AxisX.Title = "Speed (counts/ms)"; + chartArea4.AxisX.Title = "Input Speed (counts/ms)"; chartArea4.AxisY.Title = "Ratio of Output to Input)"; chartArea4.Name = "ChartArea1"; this.AccelerationChartY.ChartAreas.Add(chartArea4); @@ -697,7 +697,7 @@ namespace grapher // // VelocityChartY // - chartArea5.AxisX.Title = "Speed (count/ms)"; + chartArea5.AxisX.Title = "Input Speed (count/ms)"; chartArea5.AxisY.Title = "Output Speed (counts/ms)"; chartArea5.Name = "ChartArea1"; this.VelocityChartY.ChartAreas.Add(chartArea5); @@ -733,7 +733,7 @@ namespace grapher // // GainChartY // - chartArea6.AxisX.Title = "Speed (counts/ms)"; + chartArea6.AxisX.Title = "Input Speed (counts/ms)"; chartArea6.AxisY.Title = "Slope of Velocity Chart"; chartArea6.Name = "ChartArea1"; this.GainChartY.ChartAreas.Add(chartArea6); -- cgit v1.2.3 From 20b0304e0edc12eb983707c44f69a1c2be23ae4c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 14:16:34 -0700 Subject: Rename active to current, make dropdown display accel type on active value set --- grapher/Form1.Designer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index ecfb978..5d2a645 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -781,9 +781,9 @@ namespace grapher this.ActiveValueTitle.AutoSize = true; this.ActiveValueTitle.Location = new System.Drawing.Point(187, 30); this.ActiveValueTitle.Name = "ActiveValueTitle"; - this.ActiveValueTitle.Size = new System.Drawing.Size(37, 13); + this.ActiveValueTitle.Size = new System.Drawing.Size(41, 13); this.ActiveValueTitle.TabIndex = 35; - this.ActiveValueTitle.Text = "Active"; + this.ActiveValueTitle.Text = "Current"; // // SensitivityActiveXLabel // @@ -1063,9 +1063,9 @@ namespace grapher this.ActiveValueTitleY.AutoSize = true; this.ActiveValueTitleY.Location = new System.Drawing.Point(428, 30); this.ActiveValueTitleY.Name = "ActiveValueTitleY"; - this.ActiveValueTitleY.Size = new System.Drawing.Size(37, 13); + this.ActiveValueTitleY.Size = new System.Drawing.Size(41, 13); this.ActiveValueTitleY.TabIndex = 67; - this.ActiveValueTitleY.Text = "Active"; + this.ActiveValueTitleY.Text = "Current"; // // RawAcceleration // -- cgit v1.2.3 From c87bd1f04059f40f3dadd4e0b5bfcd860db67770 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 14:41:56 -0700 Subject: Rename write button --- grapher/Form1.Designer.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 5d2a645..e108720 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -357,11 +357,11 @@ namespace grapher // // writeButton // - this.writeButton.Location = new System.Drawing.Point(153, 293); + this.writeButton.Location = new System.Drawing.Point(154, 270); this.writeButton.Name = "writeButton"; - this.writeButton.Size = new System.Drawing.Size(102, 23); + this.writeButton.Size = new System.Drawing.Size(76, 23); this.writeButton.TabIndex = 21; - this.writeButton.Text = "Write To Driver"; + this.writeButton.Text = "Apply"; this.writeButton.UseVisualStyleBackColor = true; // // sensitivityBoxY @@ -497,8 +497,8 @@ namespace grapher // this.graphsToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.graphsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.showVelocityGainToolStripMenuItem, this.scaleByDPIToolStripMenuItem, + this.showVelocityGainToolStripMenuItem, this.showLastMouseMoveToolStripMenuItem}); this.graphsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.graphsToolStripMenuItem.Name = "graphsToolStripMenuItem"; @@ -526,7 +526,7 @@ namespace grapher this.dPIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DPITextBox}); this.dPIToolStripMenuItem.Name = "dPIToolStripMenuItem"; - this.dPIToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.dPIToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.dPIToolStripMenuItem.Text = "DPI"; // // DPITextBox @@ -540,7 +540,7 @@ namespace grapher this.pollRateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PollRateTextBox}); this.pollRateToolStripMenuItem.Name = "pollRateToolStripMenuItem"; - this.pollRateToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.pollRateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.pollRateToolStripMenuItem.Text = "Poll Rate"; // // PollRateTextBox @@ -552,7 +552,7 @@ namespace grapher // ScaleMenuItem // this.ScaleMenuItem.Name = "ScaleMenuItem"; - this.ScaleMenuItem.Size = new System.Drawing.Size(169, 22); + this.ScaleMenuItem.Size = new System.Drawing.Size(180, 22); this.ScaleMenuItem.Text = "Re-scale by above"; // // showLastMouseMoveToolStripMenuItem -- cgit v1.2.3 From f4ff6334df8a3fd66d13082606b69a78fa592237 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 15:26:08 -0700 Subject: Remove sigmoidgain, only allow one instance of grapher to run at a time --- grapher/Form1.Designer.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index e108720..c6a895d 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -98,13 +98,13 @@ namespace grapher this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.graphsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showVelocityGainToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scaleByDPIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dPIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DPITextBox = new System.Windows.Forms.ToolStripTextBox(); this.pollRateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PollRateTextBox = new System.Windows.Forms.ToolStripTextBox(); this.ScaleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showVelocityGainToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showLastMouseMoveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.capStyleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -505,12 +505,6 @@ namespace grapher this.graphsToolStripMenuItem.Size = new System.Drawing.Size(53, 20); this.graphsToolStripMenuItem.Text = "Charts"; // - // showVelocityGainToolStripMenuItem - // - this.showVelocityGainToolStripMenuItem.Name = "showVelocityGainToolStripMenuItem"; - this.showVelocityGainToolStripMenuItem.Size = new System.Drawing.Size(199, 22); - this.showVelocityGainToolStripMenuItem.Text = "Show Velocity && Gain"; - // // scaleByDPIToolStripMenuItem // this.scaleByDPIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -526,7 +520,7 @@ namespace grapher this.dPIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DPITextBox}); this.dPIToolStripMenuItem.Name = "dPIToolStripMenuItem"; - this.dPIToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.dPIToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.dPIToolStripMenuItem.Text = "DPI"; // // DPITextBox @@ -540,7 +534,7 @@ namespace grapher this.pollRateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PollRateTextBox}); this.pollRateToolStripMenuItem.Name = "pollRateToolStripMenuItem"; - this.pollRateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.pollRateToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.pollRateToolStripMenuItem.Text = "Poll Rate"; // // PollRateTextBox @@ -552,9 +546,15 @@ namespace grapher // ScaleMenuItem // this.ScaleMenuItem.Name = "ScaleMenuItem"; - this.ScaleMenuItem.Size = new System.Drawing.Size(180, 22); + this.ScaleMenuItem.Size = new System.Drawing.Size(169, 22); this.ScaleMenuItem.Text = "Re-scale by above"; // + // showVelocityGainToolStripMenuItem + // + this.showVelocityGainToolStripMenuItem.Name = "showVelocityGainToolStripMenuItem"; + this.showVelocityGainToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.showVelocityGainToolStripMenuItem.Text = "Show Velocity && Gain"; + // // showLastMouseMoveToolStripMenuItem // this.showLastMouseMoveToolStripMenuItem.Checked = true; -- cgit v1.2.3