summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2021-09-10 23:07:02 -0700
committera1xd <[email protected]>2021-09-23 22:33:13 -0400
commit2b568ff5a9c64c549a6d15a19aab0ca4d3a22c11 (patch)
tree98d8c59ada4c82dcf50220bd719f0647ca7f394a
parentupdate SettingsManager (diff)
downloadrawaccel-2b568ff5a9c64c549a6d15a19aab0ca4d3a22c11.tar.xz
rawaccel-2b568ff5a9c64c549a6d15a19aab0ca4d3a22c11.zip
Add y\x ratio to gui
-rw-r--r--grapher/Form1.Designer.cs276
-rw-r--r--grapher/Form1.cs6
-rw-r--r--grapher/Models/AccelGUI.cs4
-rw-r--r--grapher/Models/Options/AccelOptionSet.cs2
-rw-r--r--grapher/Models/Options/ApplyOptions.cs15
-rw-r--r--grapher/Models/Options/CheckBoxOption.cs3
-rw-r--r--grapher/Models/Options/LockableOption.cs89
-rw-r--r--grapher/grapher.csproj1
8 files changed, 252 insertions, 144 deletions
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index f15bce9..376809f 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -175,14 +175,14 @@ namespace grapher
this.AccelerationActiveLabelX = new System.Windows.Forms.Label();
this.AccelTypeActiveLabelX = new System.Windows.Forms.Label();
this.RotationActiveLabel = new System.Windows.Forms.Label();
- this.SensitivityActiveYLabel = new System.Windows.Forms.Label();
- this.SensitivityActiveXLabel = new System.Windows.Forms.Label();
+ this.VertHorzRatioActiveLabel = new System.Windows.Forms.Label();
+ this.SensitivityMultiplierActiveLabel = new System.Windows.Forms.Label();
this.ActiveValueTitle = new System.Windows.Forms.Label();
this.MouseLabel = new System.Windows.Forms.Label();
this.LockXYLabel = new System.Windows.Forms.Label();
this.sensXYLock = new System.Windows.Forms.CheckBox();
this.capBoxY = new System.Windows.Forms.TextBox();
- this.sensitivityBoxY = new System.Windows.Forms.TextBox();
+ this.VertHorzRatioBox = new System.Windows.Forms.TextBox();
this.writeButton = new System.Windows.Forms.Button();
this.offsetLabelX = new System.Windows.Forms.Label();
this.offsetBoxX = new System.Windows.Forms.TextBox();
@@ -223,6 +223,7 @@ namespace grapher
this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.VelocityChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
+ this.VertHorzRatioLabel = new System.Windows.Forms.Label();
this.optionsPanel.SuspendLayout();
this.DirectionalityPanel.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -238,6 +239,7 @@ namespace grapher
// optionsPanel
//
this.optionsPanel.AutoSize = true;
+ this.optionsPanel.Controls.Add(this.VertHorzRatioLabel);
this.optionsPanel.Controls.Add(this.SmoothActiveYLabel);
this.optionsPanel.Controls.Add(this.smoothLabelY);
this.optionsPanel.Controls.Add(this.SmoothActiveXLabel);
@@ -323,14 +325,14 @@ namespace grapher
this.optionsPanel.Controls.Add(this.AccelerationActiveLabelX);
this.optionsPanel.Controls.Add(this.AccelTypeActiveLabelX);
this.optionsPanel.Controls.Add(this.RotationActiveLabel);
- this.optionsPanel.Controls.Add(this.SensitivityActiveYLabel);
- this.optionsPanel.Controls.Add(this.SensitivityActiveXLabel);
+ this.optionsPanel.Controls.Add(this.VertHorzRatioActiveLabel);
+ this.optionsPanel.Controls.Add(this.SensitivityMultiplierActiveLabel);
this.optionsPanel.Controls.Add(this.ActiveValueTitle);
this.optionsPanel.Controls.Add(this.MouseLabel);
this.optionsPanel.Controls.Add(this.LockXYLabel);
this.optionsPanel.Controls.Add(this.sensXYLock);
this.optionsPanel.Controls.Add(this.capBoxY);
- this.optionsPanel.Controls.Add(this.sensitivityBoxY);
+ this.optionsPanel.Controls.Add(this.VertHorzRatioBox);
this.optionsPanel.Controls.Add(this.writeButton);
this.optionsPanel.Controls.Add(this.offsetLabelX);
this.optionsPanel.Controls.Add(this.offsetBoxX);
@@ -361,7 +363,7 @@ namespace grapher
// SmoothActiveYLabel
//
this.SmoothActiveYLabel.AutoSize = true;
- this.SmoothActiveYLabel.Location = new System.Drawing.Point(414, 677);
+ this.SmoothActiveYLabel.Location = new System.Drawing.Point(414, 704);
this.SmoothActiveYLabel.Name = "SmoothActiveYLabel";
this.SmoothActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.SmoothActiveYLabel.TabIndex = 193;
@@ -370,7 +372,7 @@ namespace grapher
// smoothLabelY
//
this.smoothLabelY.AutoSize = true;
- this.smoothLabelY.Location = new System.Drawing.Point(266, 677);
+ this.smoothLabelY.Location = new System.Drawing.Point(266, 704);
this.smoothLabelY.Name = "smoothLabelY";
this.smoothLabelY.Size = new System.Drawing.Size(43, 13);
this.smoothLabelY.TabIndex = 192;
@@ -379,7 +381,7 @@ namespace grapher
// SmoothActiveXLabel
//
this.SmoothActiveXLabel.AutoSize = true;
- this.SmoothActiveXLabel.Location = new System.Drawing.Point(200, 677);
+ this.SmoothActiveXLabel.Location = new System.Drawing.Point(200, 704);
this.SmoothActiveXLabel.Name = "SmoothActiveXLabel";
this.SmoothActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.SmoothActiveXLabel.TabIndex = 191;
@@ -388,7 +390,7 @@ namespace grapher
// smoothLabelX
//
this.smoothLabelX.AutoSize = true;
- this.smoothLabelX.Location = new System.Drawing.Point(38, 677);
+ this.smoothLabelX.Location = new System.Drawing.Point(38, 704);
this.smoothLabelX.Name = "smoothLabelX";
this.smoothLabelX.Size = new System.Drawing.Size(43, 13);
this.smoothLabelX.TabIndex = 190;
@@ -396,14 +398,14 @@ namespace grapher
//
// smoothBoxY
//
- this.smoothBoxY.Location = new System.Drawing.Point(332, 671);
+ this.smoothBoxY.Location = new System.Drawing.Point(332, 698);
this.smoothBoxY.Name = "smoothBoxY";
this.smoothBoxY.Size = new System.Drawing.Size(76, 20);
this.smoothBoxY.TabIndex = 189;
//
// smoothBoxX
//
- this.smoothBoxX.Location = new System.Drawing.Point(106, 672);
+ this.smoothBoxX.Location = new System.Drawing.Point(106, 699);
this.smoothBoxX.Name = "smoothBoxX";
this.smoothBoxX.Size = new System.Drawing.Size(76, 20);
this.smoothBoxX.TabIndex = 188;
@@ -411,7 +413,7 @@ namespace grapher
// GrowthRateActiveYLabel
//
this.GrowthRateActiveYLabel.AutoSize = true;
- this.GrowthRateActiveYLabel.Location = new System.Drawing.Point(417, 647);
+ this.GrowthRateActiveYLabel.Location = new System.Drawing.Point(417, 674);
this.GrowthRateActiveYLabel.Name = "GrowthRateActiveYLabel";
this.GrowthRateActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.GrowthRateActiveYLabel.TabIndex = 187;
@@ -420,7 +422,7 @@ namespace grapher
// GrowthRateActiveXLabel
//
this.GrowthRateActiveXLabel.AutoSize = true;
- this.GrowthRateActiveXLabel.Location = new System.Drawing.Point(200, 647);
+ this.GrowthRateActiveXLabel.Location = new System.Drawing.Point(200, 674);
this.GrowthRateActiveXLabel.Name = "GrowthRateActiveXLabel";
this.GrowthRateActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.GrowthRateActiveXLabel.TabIndex = 186;
@@ -429,7 +431,7 @@ namespace grapher
// DecayRateActiveYLabel
//
this.DecayRateActiveYLabel.AutoSize = true;
- this.DecayRateActiveYLabel.Location = new System.Drawing.Point(417, 626);
+ this.DecayRateActiveYLabel.Location = new System.Drawing.Point(417, 653);
this.DecayRateActiveYLabel.Name = "DecayRateActiveYLabel";
this.DecayRateActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.DecayRateActiveYLabel.TabIndex = 185;
@@ -438,7 +440,7 @@ namespace grapher
// DecayRateActiveXLabel
//
this.DecayRateActiveXLabel.AutoSize = true;
- this.DecayRateActiveXLabel.Location = new System.Drawing.Point(200, 622);
+ this.DecayRateActiveXLabel.Location = new System.Drawing.Point(200, 649);
this.DecayRateActiveXLabel.Name = "DecayRateActiveXLabel";
this.DecayRateActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.DecayRateActiveXLabel.TabIndex = 184;
@@ -447,7 +449,7 @@ namespace grapher
// growthRateLabelY
//
this.growthRateLabelY.AutoSize = true;
- this.growthRateLabelY.Location = new System.Drawing.Point(263, 648);
+ this.growthRateLabelY.Location = new System.Drawing.Point(263, 675);
this.growthRateLabelY.Name = "growthRateLabelY";
this.growthRateLabelY.Size = new System.Drawing.Size(67, 13);
this.growthRateLabelY.TabIndex = 183;
@@ -456,7 +458,7 @@ namespace grapher
// growthRateLabelX
//
this.growthRateLabelX.AutoSize = true;
- this.growthRateLabelX.Location = new System.Drawing.Point(37, 648);
+ this.growthRateLabelX.Location = new System.Drawing.Point(37, 675);
this.growthRateLabelX.Name = "growthRateLabelX";
this.growthRateLabelX.Size = new System.Drawing.Size(67, 13);
this.growthRateLabelX.TabIndex = 182;
@@ -465,7 +467,7 @@ namespace grapher
// decayRateLabelY
//
this.decayRateLabelY.AutoSize = true;
- this.decayRateLabelY.Location = new System.Drawing.Point(262, 622);
+ this.decayRateLabelY.Location = new System.Drawing.Point(262, 649);
this.decayRateLabelY.Name = "decayRateLabelY";
this.decayRateLabelY.Size = new System.Drawing.Size(64, 13);
this.decayRateLabelY.TabIndex = 181;
@@ -474,7 +476,7 @@ namespace grapher
// decayRateLabelX
//
this.decayRateLabelX.AutoSize = true;
- this.decayRateLabelX.Location = new System.Drawing.Point(37, 622);
+ this.decayRateLabelX.Location = new System.Drawing.Point(37, 649);
this.decayRateLabelX.Name = "decayRateLabelX";
this.decayRateLabelX.Size = new System.Drawing.Size(64, 13);
this.decayRateLabelX.TabIndex = 180;
@@ -482,28 +484,28 @@ namespace grapher
//
// growthRateBoxY
//
- this.growthRateBoxY.Location = new System.Drawing.Point(332, 644);
+ this.growthRateBoxY.Location = new System.Drawing.Point(332, 671);
this.growthRateBoxY.Name = "growthRateBoxY";
this.growthRateBoxY.Size = new System.Drawing.Size(76, 20);
this.growthRateBoxY.TabIndex = 179;
//
// growthRateBoxX
//
- this.growthRateBoxX.Location = new System.Drawing.Point(106, 645);
+ this.growthRateBoxX.Location = new System.Drawing.Point(106, 672);
this.growthRateBoxX.Name = "growthRateBoxX";
this.growthRateBoxX.Size = new System.Drawing.Size(76, 20);
this.growthRateBoxX.TabIndex = 178;
//
// decayRateBoxY
//
- this.decayRateBoxY.Location = new System.Drawing.Point(332, 619);
+ this.decayRateBoxY.Location = new System.Drawing.Point(332, 646);
this.decayRateBoxY.Name = "decayRateBoxY";
this.decayRateBoxY.Size = new System.Drawing.Size(76, 20);
this.decayRateBoxY.TabIndex = 177;
//
// decayRateBoxX
//
- this.decayRateBoxX.Location = new System.Drawing.Point(106, 619);
+ this.decayRateBoxX.Location = new System.Drawing.Point(106, 646);
this.decayRateBoxX.Name = "decayRateBoxX";
this.decayRateBoxX.Size = new System.Drawing.Size(76, 20);
this.decayRateBoxX.TabIndex = 176;
@@ -511,7 +513,7 @@ namespace grapher
// PowerClassicActiveYLabel
//
this.PowerClassicActiveYLabel.AutoSize = true;
- this.PowerClassicActiveYLabel.Location = new System.Drawing.Point(417, 599);
+ this.PowerClassicActiveYLabel.Location = new System.Drawing.Point(417, 626);
this.PowerClassicActiveYLabel.Name = "PowerClassicActiveYLabel";
this.PowerClassicActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.PowerClassicActiveYLabel.TabIndex = 175;
@@ -520,7 +522,7 @@ namespace grapher
// PowerClassicActiveXLabel
//
this.PowerClassicActiveXLabel.AutoSize = true;
- this.PowerClassicActiveXLabel.Location = new System.Drawing.Point(200, 599);
+ this.PowerClassicActiveXLabel.Location = new System.Drawing.Point(200, 626);
this.PowerClassicActiveXLabel.Name = "PowerClassicActiveXLabel";
this.PowerClassicActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.PowerClassicActiveXLabel.TabIndex = 174;
@@ -529,7 +531,7 @@ namespace grapher
// powerLabelY
//
this.powerLabelY.AutoSize = true;
- this.powerLabelY.Location = new System.Drawing.Point(263, 599);
+ this.powerLabelY.Location = new System.Drawing.Point(263, 626);
this.powerLabelY.Name = "powerLabelY";
this.powerLabelY.Size = new System.Drawing.Size(37, 13);
this.powerLabelY.TabIndex = 173;
@@ -538,7 +540,7 @@ namespace grapher
// powerLabelX
//
this.powerLabelX.AutoSize = true;
- this.powerLabelX.Location = new System.Drawing.Point(35, 595);
+ this.powerLabelX.Location = new System.Drawing.Point(35, 622);
this.powerLabelX.Name = "powerLabelX";
this.powerLabelX.Size = new System.Drawing.Size(37, 13);
this.powerLabelX.TabIndex = 172;
@@ -546,21 +548,21 @@ namespace grapher
//
// powerBoxY
//
- this.powerBoxY.Location = new System.Drawing.Point(332, 594);
+ this.powerBoxY.Location = new System.Drawing.Point(332, 621);
this.powerBoxY.Name = "powerBoxY";
this.powerBoxY.Size = new System.Drawing.Size(76, 20);
this.powerBoxY.TabIndex = 171;
//
// powerBoxX
//
- this.powerBoxX.Location = new System.Drawing.Point(106, 595);
+ this.powerBoxX.Location = new System.Drawing.Point(106, 622);
this.powerBoxX.Name = "powerBoxX";
this.powerBoxX.Size = new System.Drawing.Size(76, 20);
this.powerBoxX.TabIndex = 170;
//
// YLutActiveValuesBox
//
- this.YLutActiveValuesBox.Location = new System.Drawing.Point(397, 369);
+ this.YLutActiveValuesBox.Location = new System.Drawing.Point(397, 396);
this.YLutActiveValuesBox.Name = "YLutActiveValuesBox";
this.YLutActiveValuesBox.Size = new System.Drawing.Size(73, 72);
this.YLutActiveValuesBox.TabIndex = 169;
@@ -568,7 +570,7 @@ namespace grapher
//
// XLutActiveValuesBox
//
- this.XLutActiveValuesBox.Location = new System.Drawing.Point(317, 369);
+ this.XLutActiveValuesBox.Location = new System.Drawing.Point(317, 396);
this.XLutActiveValuesBox.Name = "XLutActiveValuesBox";
this.XLutActiveValuesBox.Size = new System.Drawing.Size(68, 72);
this.XLutActiveValuesBox.TabIndex = 168;
@@ -577,7 +579,7 @@ namespace grapher
// LutApplyActiveYLabel
//
this.LutApplyActiveYLabel.AutoSize = true;
- this.LutApplyActiveYLabel.Location = new System.Drawing.Point(417, 565);
+ this.LutApplyActiveYLabel.Location = new System.Drawing.Point(417, 592);
this.LutApplyActiveYLabel.Name = "LutApplyActiveYLabel";
this.LutApplyActiveYLabel.Size = new System.Drawing.Size(35, 13);
this.LutApplyActiveYLabel.TabIndex = 167;
@@ -586,7 +588,7 @@ namespace grapher
// YLutApplyDropdown
//
this.YLutApplyDropdown.FormattingEnabled = true;
- this.YLutApplyDropdown.Location = new System.Drawing.Point(397, 527);
+ this.YLutApplyDropdown.Location = new System.Drawing.Point(397, 554);
this.YLutApplyDropdown.Name = "YLutApplyDropdown";
this.YLutApplyDropdown.Size = new System.Drawing.Size(73, 21);
this.YLutApplyDropdown.TabIndex = 166;
@@ -594,7 +596,7 @@ namespace grapher
// XLutApplyDropdown
//
this.XLutApplyDropdown.FormattingEnabled = true;
- this.XLutApplyDropdown.Location = new System.Drawing.Point(320, 527);
+ this.XLutApplyDropdown.Location = new System.Drawing.Point(320, 554);
this.XLutApplyDropdown.Name = "XLutApplyDropdown";
this.XLutApplyDropdown.Size = new System.Drawing.Size(65, 21);
this.XLutApplyDropdown.TabIndex = 165;
@@ -602,7 +604,7 @@ namespace grapher
// LutApplyActiveXLabel
//
this.LutApplyActiveXLabel.AutoSize = true;
- this.LutApplyActiveXLabel.Location = new System.Drawing.Point(200, 565);
+ this.LutApplyActiveXLabel.Location = new System.Drawing.Point(200, 592);
this.LutApplyActiveXLabel.Name = "LutApplyActiveXLabel";
this.LutApplyActiveXLabel.Size = new System.Drawing.Size(35, 13);
this.LutApplyActiveXLabel.TabIndex = 164;
@@ -611,7 +613,7 @@ namespace grapher
// YLutApplyLabel
//
this.YLutApplyLabel.AutoSize = true;
- this.YLutApplyLabel.Location = new System.Drawing.Point(397, 510);
+ this.YLutApplyLabel.Location = new System.Drawing.Point(397, 537);
this.YLutApplyLabel.Name = "YLutApplyLabel";
this.YLutApplyLabel.Size = new System.Drawing.Size(47, 13);
this.YLutApplyLabel.TabIndex = 163;
@@ -620,7 +622,7 @@ namespace grapher
// XLutApplyLabel
//
this.XLutApplyLabel.AutoSize = true;
- this.XLutApplyLabel.Location = new System.Drawing.Point(317, 511);
+ this.XLutApplyLabel.Location = new System.Drawing.Point(317, 538);
this.XLutApplyLabel.Name = "XLutApplyLabel";
this.XLutApplyLabel.Size = new System.Drawing.Size(47, 13);
this.XLutApplyLabel.TabIndex = 162;
@@ -628,7 +630,7 @@ namespace grapher
//
// YLutPointsBox
//
- this.YLutPointsBox.Location = new System.Drawing.Point(397, 447);
+ this.YLutPointsBox.Location = new System.Drawing.Point(397, 474);
this.YLutPointsBox.Name = "YLutPointsBox";
this.YLutPointsBox.Size = new System.Drawing.Size(73, 57);
this.YLutPointsBox.TabIndex = 161;
@@ -636,7 +638,7 @@ namespace grapher
//
// XLutPointsBox
//
- this.XLutPointsBox.Location = new System.Drawing.Point(317, 447);
+ this.XLutPointsBox.Location = new System.Drawing.Point(317, 474);
this.XLutPointsBox.Name = "XLutPointsBox";
this.XLutPointsBox.Size = new System.Drawing.Size(68, 57);
this.XLutPointsBox.TabIndex = 160;
@@ -645,7 +647,7 @@ namespace grapher
// gainSwitchActiveLabelY
//
this.gainSwitchActiveLabelY.AutoSize = true;
- this.gainSwitchActiveLabelY.Location = new System.Drawing.Point(417, 95);
+ this.gainSwitchActiveLabelY.Location = new System.Drawing.Point(417, 122);
this.gainSwitchActiveLabelY.Name = "gainSwitchActiveLabelY";
this.gainSwitchActiveLabelY.Size = new System.Drawing.Size(29, 13);
this.gainSwitchActiveLabelY.TabIndex = 157;
@@ -654,7 +656,7 @@ namespace grapher
// gainSwitchActiveLabelX
//
this.gainSwitchActiveLabelX.AutoSize = true;
- this.gainSwitchActiveLabelX.Location = new System.Drawing.Point(200, 96);
+ this.gainSwitchActiveLabelX.Location = new System.Drawing.Point(200, 123);
this.gainSwitchActiveLabelX.Name = "gainSwitchActiveLabelX";
this.gainSwitchActiveLabelX.Size = new System.Drawing.Size(29, 13);
this.gainSwitchActiveLabelX.TabIndex = 156;
@@ -665,7 +667,7 @@ namespace grapher
this.gainSwitchY.AutoSize = true;
this.gainSwitchY.Checked = true;
this.gainSwitchY.CheckState = System.Windows.Forms.CheckState.Checked;
- this.gainSwitchY.Location = new System.Drawing.Point(283, 116);
+ this.gainSwitchY.Location = new System.Drawing.Point(283, 143);
this.gainSwitchY.Name = "gainSwitchY";
this.gainSwitchY.Size = new System.Drawing.Size(48, 17);
this.gainSwitchY.TabIndex = 155;
@@ -677,7 +679,7 @@ namespace grapher
this.gainSwitchX.AutoSize = true;
this.gainSwitchX.Checked = true;
this.gainSwitchX.CheckState = System.Windows.Forms.CheckState.Checked;
- this.gainSwitchX.Location = new System.Drawing.Point(38, 116);
+ this.gainSwitchX.Location = new System.Drawing.Point(38, 143);
this.gainSwitchX.Name = "gainSwitchX";
this.gainSwitchX.Size = new System.Drawing.Size(48, 17);
this.gainSwitchX.TabIndex = 154;
@@ -687,7 +689,7 @@ namespace grapher
// LUTTextLabelY
//
this.LUTTextLabelY.AutoSize = true;
- this.LUTTextLabelY.Location = new System.Drawing.Point(266, 350);
+ this.LUTTextLabelY.Location = new System.Drawing.Point(266, 377);
this.LUTTextLabelY.Name = "LUTTextLabelY";
this.LUTTextLabelY.Size = new System.Drawing.Size(52, 13);
this.LUTTextLabelY.TabIndex = 153;
@@ -696,7 +698,7 @@ namespace grapher
// LUTTextLabelX
//
this.LUTTextLabelX.AutoSize = true;
- this.LUTTextLabelX.Location = new System.Drawing.Point(38, 350);
+ this.LUTTextLabelX.Location = new System.Drawing.Point(38, 377);
this.LUTTextLabelX.Name = "LUTTextLabelX";
this.LUTTextLabelX.Size = new System.Drawing.Size(52, 13);
this.LUTTextLabelX.TabIndex = 152;
@@ -705,7 +707,7 @@ namespace grapher
// FakeBox
//
this.FakeBox.AutoSize = true;
- this.FakeBox.Location = new System.Drawing.Point(31, 538);
+ this.FakeBox.Location = new System.Drawing.Point(31, 565);
this.FakeBox.Name = "FakeBox";
this.FakeBox.Size = new System.Drawing.Size(47, 17);
this.FakeBox.TabIndex = 151;
@@ -733,7 +735,7 @@ namespace grapher
this.DirectionalityPanel.Controls.Add(this.DomainBoxY);
this.DirectionalityPanel.Controls.Add(this.DomainBoxX);
this.DirectionalityPanel.Controls.Add(this.DirectionalityLabel);
- this.DirectionalityPanel.Location = new System.Drawing.Point(12, 369);
+ this.DirectionalityPanel.Location = new System.Drawing.Point(12, 396);
this.DirectionalityPanel.Name = "DirectionalityPanel";
this.DirectionalityPanel.Size = new System.Drawing.Size(298, 135);
this.DirectionalityPanel.TabIndex = 150;
@@ -906,7 +908,7 @@ namespace grapher
//
// toggleButton
//
- this.toggleButton.Location = new System.Drawing.Point(211, 534);
+ this.toggleButton.Location = new System.Drawing.Point(211, 561);
this.toggleButton.Name = "toggleButton";
this.toggleButton.Size = new System.Drawing.Size(104, 24);
this.toggleButton.TabIndex = 112;
@@ -916,7 +918,7 @@ namespace grapher
// scaleLabelY
//
this.scaleLabelY.AutoSize = true;
- this.scaleLabelY.Location = new System.Drawing.Point(263, 333);
+ this.scaleLabelY.Location = new System.Drawing.Point(263, 360);
this.scaleLabelY.Name = "scaleLabelY";
this.scaleLabelY.Size = new System.Drawing.Size(34, 13);
this.scaleLabelY.TabIndex = 149;
@@ -925,7 +927,7 @@ namespace grapher
// ScaleActiveYLabel
//
this.ScaleActiveYLabel.AutoSize = true;
- this.ScaleActiveYLabel.Location = new System.Drawing.Point(414, 333);
+ this.ScaleActiveYLabel.Location = new System.Drawing.Point(414, 360);
this.ScaleActiveYLabel.Name = "ScaleActiveYLabel";
this.ScaleActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.ScaleActiveYLabel.TabIndex = 148;
@@ -933,7 +935,7 @@ namespace grapher
//
// scaleBoxY
//
- this.scaleBoxY.Location = new System.Drawing.Point(332, 330);
+ this.scaleBoxY.Location = new System.Drawing.Point(332, 357);
this.scaleBoxY.Name = "scaleBoxY";
this.scaleBoxY.Size = new System.Drawing.Size(76, 20);
this.scaleBoxY.TabIndex = 102;
@@ -941,7 +943,7 @@ namespace grapher
// ScaleActiveXLabel
//
this.ScaleActiveXLabel.AutoSize = true;
- this.ScaleActiveXLabel.Location = new System.Drawing.Point(197, 333);
+ this.ScaleActiveXLabel.Location = new System.Drawing.Point(197, 360);
this.ScaleActiveXLabel.Name = "ScaleActiveXLabel";
this.ScaleActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.ScaleActiveXLabel.TabIndex = 147;
@@ -950,7 +952,7 @@ namespace grapher
// scaleLabelX
//
this.scaleLabelX.AutoSize = true;
- this.scaleLabelX.Location = new System.Drawing.Point(37, 333);
+ this.scaleLabelX.Location = new System.Drawing.Point(37, 360);
this.scaleLabelX.Name = "scaleLabelX";
this.scaleLabelX.Size = new System.Drawing.Size(34, 13);
this.scaleLabelX.TabIndex = 146;
@@ -959,7 +961,7 @@ namespace grapher
//
// scaleBoxX
//
- this.scaleBoxX.Location = new System.Drawing.Point(106, 330);
+ this.scaleBoxX.Location = new System.Drawing.Point(106, 357);
this.scaleBoxX.Name = "scaleBoxX";
this.scaleBoxX.Size = new System.Drawing.Size(76, 20);
this.scaleBoxX.TabIndex = 88;
@@ -967,7 +969,7 @@ namespace grapher
// expLabelY
//
this.expLabelY.AutoSize = true;
- this.expLabelY.Location = new System.Drawing.Point(263, 276);
+ this.expLabelY.Location = new System.Drawing.Point(263, 303);
this.expLabelY.Name = "expLabelY";
this.expLabelY.Size = new System.Drawing.Size(52, 13);
this.expLabelY.TabIndex = 145;
@@ -976,7 +978,7 @@ namespace grapher
// ExpActiveYLabel
//
this.ExpActiveYLabel.AutoSize = true;
- this.ExpActiveYLabel.Location = new System.Drawing.Point(414, 276);
+ this.ExpActiveYLabel.Location = new System.Drawing.Point(414, 303);
this.ExpActiveYLabel.Name = "ExpActiveYLabel";
this.ExpActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.ExpActiveYLabel.TabIndex = 144;
@@ -984,7 +986,7 @@ namespace grapher
//
// expBoxY
//
- this.expBoxY.Location = new System.Drawing.Point(332, 273);
+ this.expBoxY.Location = new System.Drawing.Point(332, 300);
this.expBoxY.Name = "expBoxY";
this.expBoxY.Size = new System.Drawing.Size(76, 20);
this.expBoxY.TabIndex = 109;
@@ -992,7 +994,7 @@ namespace grapher
// ExpActiveXLabel
//
this.ExpActiveXLabel.AutoSize = true;
- this.ExpActiveXLabel.Location = new System.Drawing.Point(197, 276);
+ this.ExpActiveXLabel.Location = new System.Drawing.Point(197, 303);
this.ExpActiveXLabel.Name = "ExpActiveXLabel";
this.ExpActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.ExpActiveXLabel.TabIndex = 143;
@@ -1001,7 +1003,7 @@ namespace grapher
// expLabelX
//
this.expLabelX.AutoSize = true;
- this.expLabelX.Location = new System.Drawing.Point(37, 276);
+ this.expLabelX.Location = new System.Drawing.Point(37, 303);
this.expLabelX.Name = "expLabelX";
this.expLabelX.Size = new System.Drawing.Size(52, 13);
this.expLabelX.TabIndex = 142;
@@ -1010,7 +1012,7 @@ namespace grapher
//
// expBoxX
//
- this.expBoxX.Location = new System.Drawing.Point(106, 273);
+ this.expBoxX.Location = new System.Drawing.Point(106, 300);
this.expBoxX.Name = "expBoxX";
this.expBoxX.Size = new System.Drawing.Size(76, 20);
this.expBoxX.TabIndex = 95;
@@ -1027,7 +1029,7 @@ namespace grapher
// AccelTypeActiveLabelY
//
this.AccelTypeActiveLabelY.AutoSize = true;
- this.AccelTypeActiveLabelY.Location = new System.Drawing.Point(414, 116);
+ this.AccelTypeActiveLabelY.Location = new System.Drawing.Point(414, 143);
this.AccelTypeActiveLabelY.Name = "AccelTypeActiveLabelY";
this.AccelTypeActiveLabelY.Size = new System.Drawing.Size(66, 13);
this.AccelTypeActiveLabelY.TabIndex = 140;
@@ -1036,7 +1038,7 @@ namespace grapher
// OptionSetYTitle
//
this.OptionSetYTitle.AutoSize = true;
- this.OptionSetYTitle.Location = new System.Drawing.Point(360, 97);
+ this.OptionSetYTitle.Location = new System.Drawing.Point(360, 124);
this.OptionSetYTitle.Name = "OptionSetYTitle";
this.OptionSetYTitle.Size = new System.Drawing.Size(14, 13);
this.OptionSetYTitle.TabIndex = 139;
@@ -1045,7 +1047,7 @@ namespace grapher
// OptionSetXTitle
//
this.OptionSetXTitle.AutoSize = true;
- this.OptionSetXTitle.Location = new System.Drawing.Point(143, 97);
+ this.OptionSetXTitle.Location = new System.Drawing.Point(143, 124);
this.OptionSetXTitle.Name = "OptionSetXTitle";
this.OptionSetXTitle.Size = new System.Drawing.Size(14, 13);
this.OptionSetXTitle.TabIndex = 138;
@@ -1054,7 +1056,7 @@ namespace grapher
// constantThreeLabelY
//
this.constantThreeLabelY.AutoSize = true;
- this.constantThreeLabelY.Location = new System.Drawing.Point(263, 303);
+ this.constantThreeLabelY.Location = new System.Drawing.Point(263, 330);
this.constantThreeLabelY.Name = "constantThreeLabelY";
this.constantThreeLabelY.Size = new System.Drawing.Size(47, 13);
this.constantThreeLabelY.TabIndex = 137;
@@ -1063,7 +1065,7 @@ namespace grapher
// limitLabelY
//
this.limitLabelY.AutoSize = true;
- this.limitLabelY.Location = new System.Drawing.Point(263, 247);
+ this.limitLabelY.Location = new System.Drawing.Point(263, 274);
this.limitLabelY.Name = "limitLabelY";
this.limitLabelY.Size = new System.Drawing.Size(28, 13);
this.limitLabelY.TabIndex = 136;
@@ -1072,7 +1074,7 @@ namespace grapher
// offsetLabelY
//
this.offsetLabelY.AutoSize = true;
- this.offsetLabelY.Location = new System.Drawing.Point(263, 221);
+ this.offsetLabelY.Location = new System.Drawing.Point(263, 248);
this.offsetLabelY.Name = "offsetLabelY";
this.offsetLabelY.Size = new System.Drawing.Size(35, 13);
this.offsetLabelY.TabIndex = 135;
@@ -1081,7 +1083,7 @@ namespace grapher
// weightLabelY
//
this.weightLabelY.AutoSize = true;
- this.weightLabelY.Location = new System.Drawing.Point(263, 195);
+ this.weightLabelY.Location = new System.Drawing.Point(263, 222);
this.weightLabelY.Name = "weightLabelY";
this.weightLabelY.Size = new System.Drawing.Size(41, 13);
this.weightLabelY.TabIndex = 134;
@@ -1090,7 +1092,7 @@ namespace grapher
// capLabelY
//
this.capLabelY.AutoSize = true;
- this.capLabelY.Location = new System.Drawing.Point(263, 169);
+ this.capLabelY.Location = new System.Drawing.Point(263, 196);
this.capLabelY.Name = "capLabelY";
this.capLabelY.Size = new System.Drawing.Size(26, 13);
this.capLabelY.TabIndex = 133;
@@ -1099,7 +1101,7 @@ namespace grapher
// constantOneLabelY
//
this.constantOneLabelY.AutoSize = true;
- this.constantOneLabelY.Location = new System.Drawing.Point(263, 143);
+ this.constantOneLabelY.Location = new System.Drawing.Point(263, 170);
this.constantOneLabelY.Name = "constantOneLabelY";
this.constantOneLabelY.Size = new System.Drawing.Size(66, 13);
this.constantOneLabelY.TabIndex = 132;
@@ -1110,7 +1112,7 @@ namespace grapher
this.ByComponentXYLock.AutoSize = true;
this.ByComponentXYLock.Checked = true;
this.ByComponentXYLock.CheckState = System.Windows.Forms.CheckState.Checked;
- this.ByComponentXYLock.Location = new System.Drawing.Point(283, 96);
+ this.ByComponentXYLock.Location = new System.Drawing.Point(283, 123);
this.ByComponentXYLock.Name = "ByComponentXYLock";
this.ByComponentXYLock.Size = new System.Drawing.Size(15, 14);
this.ByComponentXYLock.TabIndex = 98;
@@ -1119,7 +1121,7 @@ namespace grapher
// MidpointActiveYLabel
//
this.MidpointActiveYLabel.AutoSize = true;
- this.MidpointActiveYLabel.Location = new System.Drawing.Point(414, 303);
+ this.MidpointActiveYLabel.Location = new System.Drawing.Point(414, 330);
this.MidpointActiveYLabel.Name = "MidpointActiveYLabel";
this.MidpointActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.MidpointActiveYLabel.TabIndex = 131;
@@ -1128,7 +1130,7 @@ namespace grapher
// LimitActiveYLabel
//
this.LimitActiveYLabel.AutoSize = true;
- this.LimitActiveYLabel.Location = new System.Drawing.Point(414, 247);
+ this.LimitActiveYLabel.Location = new System.Drawing.Point(414, 274);
this.LimitActiveYLabel.Name = "LimitActiveYLabel";
this.LimitActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.LimitActiveYLabel.TabIndex = 130;
@@ -1137,7 +1139,7 @@ namespace grapher
// OffsetActiveYLabel
//
this.OffsetActiveYLabel.AutoSize = true;
- this.OffsetActiveYLabel.Location = new System.Drawing.Point(414, 221);
+ this.OffsetActiveYLabel.Location = new System.Drawing.Point(414, 248);
this.OffsetActiveYLabel.Name = "OffsetActiveYLabel";
this.OffsetActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.OffsetActiveYLabel.TabIndex = 129;
@@ -1146,7 +1148,7 @@ namespace grapher
// AccelerationActiveLabelY
//
this.AccelerationActiveLabelY.AutoSize = true;
- this.AccelerationActiveLabelY.Location = new System.Drawing.Point(414, 143);
+ this.AccelerationActiveLabelY.Location = new System.Drawing.Point(414, 170);
this.AccelerationActiveLabelY.Name = "AccelerationActiveLabelY";
this.AccelerationActiveLabelY.Size = new System.Drawing.Size(13, 13);
this.AccelerationActiveLabelY.TabIndex = 128;
@@ -1155,7 +1157,7 @@ namespace grapher
// accelTypeDropY
//
this.accelTypeDropY.FormattingEnabled = true;
- this.accelTypeDropY.Location = new System.Drawing.Point(332, 113);
+ this.accelTypeDropY.Location = new System.Drawing.Point(332, 140);
this.accelTypeDropY.Name = "accelTypeDropY";
this.accelTypeDropY.Size = new System.Drawing.Size(76, 21);
this.accelTypeDropY.TabIndex = 99;
@@ -1163,28 +1165,28 @@ namespace grapher
//
// midpointBoxY
//
- this.midpointBoxY.Location = new System.Drawing.Point(332, 300);
+ this.midpointBoxY.Location = new System.Drawing.Point(332, 327);
this.midpointBoxY.Name = "midpointBoxY";
this.midpointBoxY.Size = new System.Drawing.Size(76, 20);
this.midpointBoxY.TabIndex = 110;
//
// limitBoxY
//
- this.limitBoxY.Location = new System.Drawing.Point(332, 244);
+ this.limitBoxY.Location = new System.Drawing.Point(332, 271);
this.limitBoxY.Name = "limitBoxY";
this.limitBoxY.Size = new System.Drawing.Size(76, 20);
this.limitBoxY.TabIndex = 108;
//
// offsetBoxY
//
- this.offsetBoxY.Location = new System.Drawing.Point(332, 218);
+ this.offsetBoxY.Location = new System.Drawing.Point(332, 245);
this.offsetBoxY.Name = "offsetBoxY";
this.offsetBoxY.Size = new System.Drawing.Size(76, 20);
this.offsetBoxY.TabIndex = 106;
//
// accelerationBoxY
//
- this.accelerationBoxY.Location = new System.Drawing.Point(332, 140);
+ this.accelerationBoxY.Location = new System.Drawing.Point(332, 167);
this.accelerationBoxY.Name = "accelerationBoxY";
this.accelerationBoxY.Size = new System.Drawing.Size(76, 20);
this.accelerationBoxY.TabIndex = 100;
@@ -1192,7 +1194,7 @@ namespace grapher
// MidpointActiveXLabel
//
this.MidpointActiveXLabel.AutoSize = true;
- this.MidpointActiveXLabel.Location = new System.Drawing.Point(197, 303);
+ this.MidpointActiveXLabel.Location = new System.Drawing.Point(197, 330);
this.MidpointActiveXLabel.Name = "MidpointActiveXLabel";
this.MidpointActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.MidpointActiveXLabel.TabIndex = 127;
@@ -1201,7 +1203,7 @@ namespace grapher
// LimitActiveXLabel
//
this.LimitActiveXLabel.AutoSize = true;
- this.LimitActiveXLabel.Location = new System.Drawing.Point(197, 247);
+ this.LimitActiveXLabel.Location = new System.Drawing.Point(197, 274);
this.LimitActiveXLabel.Name = "LimitActiveXLabel";
this.LimitActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.LimitActiveXLabel.TabIndex = 126;
@@ -1210,7 +1212,7 @@ namespace grapher
// OffsetActiveXLabel
//
this.OffsetActiveXLabel.AutoSize = true;
- this.OffsetActiveXLabel.Location = new System.Drawing.Point(197, 221);
+ this.OffsetActiveXLabel.Location = new System.Drawing.Point(197, 248);
this.OffsetActiveXLabel.Name = "OffsetActiveXLabel";
this.OffsetActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.OffsetActiveXLabel.TabIndex = 125;
@@ -1219,7 +1221,7 @@ namespace grapher
// CapActiveYLabel
//
this.CapActiveYLabel.AutoSize = true;
- this.CapActiveYLabel.Location = new System.Drawing.Point(414, 169);
+ this.CapActiveYLabel.Location = new System.Drawing.Point(414, 196);
this.CapActiveYLabel.Name = "CapActiveYLabel";
this.CapActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.CapActiveYLabel.TabIndex = 124;
@@ -1228,7 +1230,7 @@ namespace grapher
// WeightActiveYLabel
//
this.WeightActiveYLabel.AutoSize = true;
- this.WeightActiveYLabel.Location = new System.Drawing.Point(414, 195);
+ this.WeightActiveYLabel.Location = new System.Drawing.Point(414, 222);
this.WeightActiveYLabel.Name = "WeightActiveYLabel";
this.WeightActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.WeightActiveYLabel.TabIndex = 123;
@@ -1237,7 +1239,7 @@ namespace grapher
// WeightActiveXLabel
//
this.WeightActiveXLabel.AutoSize = true;
- this.WeightActiveXLabel.Location = new System.Drawing.Point(197, 195);
+ this.WeightActiveXLabel.Location = new System.Drawing.Point(197, 222);
this.WeightActiveXLabel.Name = "WeightActiveXLabel";
this.WeightActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.WeightActiveXLabel.TabIndex = 122;
@@ -1246,7 +1248,7 @@ namespace grapher
// CapActiveXLabel
//
this.CapActiveXLabel.AutoSize = true;
- this.CapActiveXLabel.Location = new System.Drawing.Point(197, 169);
+ this.CapActiveXLabel.Location = new System.Drawing.Point(197, 196);
this.CapActiveXLabel.Name = "CapActiveXLabel";
this.CapActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.CapActiveXLabel.TabIndex = 121;
@@ -1255,7 +1257,7 @@ namespace grapher
// AccelerationActiveLabelX
//
this.AccelerationActiveLabelX.AutoSize = true;
- this.AccelerationActiveLabelX.Location = new System.Drawing.Point(197, 143);
+ this.AccelerationActiveLabelX.Location = new System.Drawing.Point(197, 170);
this.AccelerationActiveLabelX.Name = "AccelerationActiveLabelX";
this.AccelerationActiveLabelX.Size = new System.Drawing.Size(13, 13);
this.AccelerationActiveLabelX.TabIndex = 120;
@@ -1264,7 +1266,7 @@ namespace grapher
// AccelTypeActiveLabelX
//
this.AccelTypeActiveLabelX.AutoSize = true;
- this.AccelTypeActiveLabelX.Location = new System.Drawing.Point(197, 116);
+ this.AccelTypeActiveLabelX.Location = new System.Drawing.Point(197, 143);
this.AccelTypeActiveLabelX.Name = "AccelTypeActiveLabelX";
this.AccelTypeActiveLabelX.Size = new System.Drawing.Size(66, 13);
this.AccelTypeActiveLabelX.TabIndex = 119;
@@ -1273,29 +1275,29 @@ namespace grapher
// RotationActiveLabel
//
this.RotationActiveLabel.AutoSize = true;
- this.RotationActiveLabel.Location = new System.Drawing.Point(197, 78);
+ this.RotationActiveLabel.Location = new System.Drawing.Point(197, 105);
this.RotationActiveLabel.Name = "RotationActiveLabel";
this.RotationActiveLabel.Size = new System.Drawing.Size(13, 13);
this.RotationActiveLabel.TabIndex = 118;
this.RotationActiveLabel.Text = "0";
//
- // SensitivityActiveYLabel
+ // VertHorzRatioActiveLabel
//
- this.SensitivityActiveYLabel.AutoSize = true;
- this.SensitivityActiveYLabel.Location = new System.Drawing.Point(217, 52);
- this.SensitivityActiveYLabel.Name = "SensitivityActiveYLabel";
- this.SensitivityActiveYLabel.Size = new System.Drawing.Size(14, 13);
- this.SensitivityActiveYLabel.TabIndex = 117;
- this.SensitivityActiveYLabel.Text = "Y";
+ this.VertHorzRatioActiveLabel.AutoSize = true;
+ this.VertHorzRatioActiveLabel.Location = new System.Drawing.Point(196, 76);
+ this.VertHorzRatioActiveLabel.Name = "VertHorzRatioActiveLabel";
+ this.VertHorzRatioActiveLabel.Size = new System.Drawing.Size(13, 13);
+ this.VertHorzRatioActiveLabel.TabIndex = 117;
+ this.VertHorzRatioActiveLabel.Text = "0";
//
- // SensitivityActiveXLabel
+ // SensitivityMultiplierActiveLabel
//
- this.SensitivityActiveXLabel.AutoSize = true;
- this.SensitivityActiveXLabel.Location = new System.Drawing.Point(188, 52);
- this.SensitivityActiveXLabel.Name = "SensitivityActiveXLabel";
- this.SensitivityActiveXLabel.Size = new System.Drawing.Size(14, 13);
- this.SensitivityActiveXLabel.TabIndex = 116;
- this.SensitivityActiveXLabel.Text = "X";
+ this.SensitivityMultiplierActiveLabel.AutoSize = true;
+ this.SensitivityMultiplierActiveLabel.Location = new System.Drawing.Point(195, 52);
+ this.SensitivityMultiplierActiveLabel.Name = "SensitivityMultiplierActiveLabel";
+ this.SensitivityMultiplierActiveLabel.Size = new System.Drawing.Size(13, 13);
+ this.SensitivityMultiplierActiveLabel.TabIndex = 116;
+ this.SensitivityMultiplierActiveLabel.Text = "0";
//
// ActiveValueTitle
//
@@ -1329,7 +1331,7 @@ namespace grapher
this.sensXYLock.AutoSize = true;
this.sensXYLock.Checked = true;
this.sensXYLock.CheckState = System.Windows.Forms.CheckState.Checked;
- this.sensXYLock.Location = new System.Drawing.Point(283, 49);
+ this.sensXYLock.Location = new System.Drawing.Point(282, 75);
this.sensXYLock.Name = "sensXYLock";
this.sensXYLock.Size = new System.Drawing.Size(15, 14);
this.sensXYLock.TabIndex = 82;
@@ -1337,22 +1339,22 @@ namespace grapher
//
// capBoxY
//
- this.capBoxY.Location = new System.Drawing.Point(332, 166);
+ this.capBoxY.Location = new System.Drawing.Point(332, 193);
this.capBoxY.Name = "capBoxY";
this.capBoxY.Size = new System.Drawing.Size(76, 20);
this.capBoxY.TabIndex = 103;
//
- // sensitivityBoxY
+ // VertHorzRatioBox
//
- this.sensitivityBoxY.Location = new System.Drawing.Point(148, 49);
- this.sensitivityBoxY.Name = "sensitivityBoxY";
- this.sensitivityBoxY.Size = new System.Drawing.Size(34, 20);
- this.sensitivityBoxY.TabIndex = 81;
+ this.VertHorzRatioBox.Location = new System.Drawing.Point(106, 76);
+ this.VertHorzRatioBox.Name = "VertHorzRatioBox";
+ this.VertHorzRatioBox.Size = new System.Drawing.Size(76, 20);
+ this.VertHorzRatioBox.TabIndex = 81;
//
// writeButton
//
this.writeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
- this.writeButton.Location = new System.Drawing.Point(90, 527);
+ this.writeButton.Location = new System.Drawing.Point(90, 554);
this.writeButton.Name = "writeButton";
this.writeButton.Size = new System.Drawing.Size(92, 35);
this.writeButton.TabIndex = 111;
@@ -1362,7 +1364,7 @@ namespace grapher
// offsetLabelX
//
this.offsetLabelX.AutoSize = true;
- this.offsetLabelX.Location = new System.Drawing.Point(37, 221);
+ this.offsetLabelX.Location = new System.Drawing.Point(37, 248);
this.offsetLabelX.Name = "offsetLabelX";
this.offsetLabelX.Size = new System.Drawing.Size(35, 13);
this.offsetLabelX.TabIndex = 107;
@@ -1371,7 +1373,7 @@ namespace grapher
//
// offsetBoxX
//
- this.offsetBoxX.Location = new System.Drawing.Point(106, 218);
+ this.offsetBoxX.Location = new System.Drawing.Point(106, 245);
this.offsetBoxX.Name = "offsetBoxX";
this.offsetBoxX.Size = new System.Drawing.Size(76, 20);
this.offsetBoxX.TabIndex = 92;
@@ -1379,7 +1381,7 @@ namespace grapher
// constantThreeLabelX
//
this.constantThreeLabelX.AutoSize = true;
- this.constantThreeLabelX.Location = new System.Drawing.Point(37, 303);
+ this.constantThreeLabelX.Location = new System.Drawing.Point(37, 330);
this.constantThreeLabelX.Name = "constantThreeLabelX";
this.constantThreeLabelX.Size = new System.Drawing.Size(47, 13);
this.constantThreeLabelX.TabIndex = 105;
@@ -1388,7 +1390,7 @@ namespace grapher
//
// midpointBoxX
//
- this.midpointBoxX.Location = new System.Drawing.Point(106, 300);
+ this.midpointBoxX.Location = new System.Drawing.Point(106, 327);
this.midpointBoxX.Name = "midpointBoxX";
this.midpointBoxX.Size = new System.Drawing.Size(76, 20);
this.midpointBoxX.TabIndex = 96;
@@ -1396,7 +1398,7 @@ namespace grapher
// limitLabelX
//
this.limitLabelX.AutoSize = true;
- this.limitLabelX.Location = new System.Drawing.Point(37, 247);
+ this.limitLabelX.Location = new System.Drawing.Point(37, 274);
this.limitLabelX.Name = "limitLabelX";
this.limitLabelX.Size = new System.Drawing.Size(28, 13);
this.limitLabelX.TabIndex = 101;
@@ -1405,14 +1407,14 @@ namespace grapher
//
// limitBoxX
//
- this.limitBoxX.Location = new System.Drawing.Point(106, 244);
+ this.limitBoxX.Location = new System.Drawing.Point(106, 271);
this.limitBoxX.Name = "limitBoxX";
this.limitBoxX.Size = new System.Drawing.Size(76, 20);
this.limitBoxX.TabIndex = 93;
//
// weightBoxY
//
- this.weightBoxY.Location = new System.Drawing.Point(332, 192);
+ this.weightBoxY.Location = new System.Drawing.Point(332, 219);
this.weightBoxY.Name = "weightBoxY";
this.weightBoxY.Size = new System.Drawing.Size(76, 20);
this.weightBoxY.TabIndex = 104;
@@ -1420,7 +1422,7 @@ namespace grapher
// weightLabelX
//
this.weightLabelX.AutoSize = true;
- this.weightLabelX.Location = new System.Drawing.Point(37, 195);
+ this.weightLabelX.Location = new System.Drawing.Point(37, 222);
this.weightLabelX.Name = "weightLabelX";
this.weightLabelX.Size = new System.Drawing.Size(41, 13);
this.weightLabelX.TabIndex = 97;
@@ -1429,7 +1431,7 @@ namespace grapher
//
// weightBoxX
//
- this.weightBoxX.Location = new System.Drawing.Point(106, 192);
+ this.weightBoxX.Location = new System.Drawing.Point(106, 219);
this.weightBoxX.Name = "weightBoxX";
this.weightBoxX.Size = new System.Drawing.Size(76, 20);
this.weightBoxX.TabIndex = 90;
@@ -1437,7 +1439,7 @@ namespace grapher
// capLabelX
//
this.capLabelX.AutoSize = true;
- this.capLabelX.Location = new System.Drawing.Point(37, 169);
+ this.capLabelX.Location = new System.Drawing.Point(37, 196);
this.capLabelX.Name = "capLabelX";
this.capLabelX.Size = new System.Drawing.Size(26, 13);
this.capLabelX.TabIndex = 94;
@@ -1446,7 +1448,7 @@ namespace grapher
//
// capBoxX
//
- this.capBoxX.Location = new System.Drawing.Point(106, 166);
+ this.capBoxX.Location = new System.Drawing.Point(106, 193);
this.capBoxX.Name = "capBoxX";
this.capBoxX.Size = new System.Drawing.Size(76, 20);
this.capBoxX.TabIndex = 89;
@@ -1454,7 +1456,7 @@ namespace grapher
// constantOneLabelX
//
this.constantOneLabelX.AutoSize = true;
- this.constantOneLabelX.Location = new System.Drawing.Point(37, 143);
+ this.constantOneLabelX.Location = new System.Drawing.Point(37, 170);
this.constantOneLabelX.Name = "constantOneLabelX";
this.constantOneLabelX.Size = new System.Drawing.Size(66, 13);
this.constantOneLabelX.TabIndex = 91;
@@ -1463,7 +1465,7 @@ namespace grapher
//
// accelerationBoxX
//
- this.accelerationBoxX.Location = new System.Drawing.Point(106, 140);
+ this.accelerationBoxX.Location = new System.Drawing.Point(106, 167);
this.accelerationBoxX.Name = "accelerationBoxX";
this.accelerationBoxX.Size = new System.Drawing.Size(76, 20);
this.accelerationBoxX.TabIndex = 86;
@@ -1471,7 +1473,7 @@ namespace grapher
// rotationLabel
//
this.rotationLabel.AutoSize = true;
- this.rotationLabel.Location = new System.Drawing.Point(35, 78);
+ this.rotationLabel.Location = new System.Drawing.Point(35, 105);
this.rotationLabel.Name = "rotationLabel";
this.rotationLabel.Size = new System.Drawing.Size(47, 13);
this.rotationLabel.TabIndex = 87;
@@ -1479,7 +1481,7 @@ namespace grapher
//
// rotationBox
//
- this.rotationBox.Location = new System.Drawing.Point(106, 75);
+ this.rotationBox.Location = new System.Drawing.Point(106, 102);
this.rotationBox.Name = "rotationBox";
this.rotationBox.Size = new System.Drawing.Size(76, 20);
this.rotationBox.TabIndex = 83;
@@ -1497,13 +1499,13 @@ namespace grapher
//
this.sensitivityBoxX.Location = new System.Drawing.Point(106, 49);
this.sensitivityBoxX.Name = "sensitivityBoxX";
- this.sensitivityBoxX.Size = new System.Drawing.Size(34, 20);
+ this.sensitivityBoxX.Size = new System.Drawing.Size(76, 20);
this.sensitivityBoxX.TabIndex = 80;
//
// accelTypeDropX
//
this.accelTypeDropX.FormattingEnabled = true;
- this.accelTypeDropX.Location = new System.Drawing.Point(106, 113);
+ this.accelTypeDropX.Location = new System.Drawing.Point(106, 140);
this.accelTypeDropX.Name = "accelTypeDropX";
this.accelTypeDropX.Size = new System.Drawing.Size(76, 21);
this.accelTypeDropX.TabIndex = 84;
@@ -1876,6 +1878,15 @@ namespace grapher
title6.Text = "Sensitivity";
this.AccelerationChart.Titles.Add(title6);
//
+ // VertHorzRatioLabel
+ //
+ this.VertHorzRatioLabel.AutoSize = true;
+ this.VertHorzRatioLabel.Location = new System.Drawing.Point(28, 79);
+ this.VertHorzRatioLabel.Name = "VertHorzRatioLabel";
+ this.VertHorzRatioLabel.Size = new System.Drawing.Size(59, 13);
+ this.VertHorzRatioLabel.TabIndex = 194;
+ this.VertHorzRatioLabel.Text = "Y to X ratio";
+ //
// RawAcceleration
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1949,14 +1960,14 @@ namespace grapher
private System.Windows.Forms.Label AccelerationActiveLabelX;
private System.Windows.Forms.Label AccelTypeActiveLabelX;
private System.Windows.Forms.Label RotationActiveLabel;
- private System.Windows.Forms.Label SensitivityActiveYLabel;
- private System.Windows.Forms.Label SensitivityActiveXLabel;
+ private System.Windows.Forms.Label VertHorzRatioActiveLabel;
+ private System.Windows.Forms.Label SensitivityMultiplierActiveLabel;
private System.Windows.Forms.Label ActiveValueTitle;
private System.Windows.Forms.Label MouseLabel;
private System.Windows.Forms.Label LockXYLabel;
private System.Windows.Forms.CheckBox sensXYLock;
private System.Windows.Forms.TextBox capBoxY;
- private System.Windows.Forms.TextBox sensitivityBoxY;
+ private System.Windows.Forms.TextBox VertHorzRatioBox;
private System.Windows.Forms.Button writeButton;
private System.Windows.Forms.Label offsetLabelX;
private System.Windows.Forms.TextBox offsetBoxX;
@@ -2058,6 +2069,7 @@ namespace grapher
private System.Windows.Forms.Label smoothLabelX;
private System.Windows.Forms.TextBox smoothBoxY;
private System.Windows.Forms.TextBox smoothBoxX;
+ private System.Windows.Forms.Label VertHorzRatioLabel;
}
}
diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index c492a9b..91bc980 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -62,7 +62,7 @@ namespace grapher
PollRateTextBox,
DirectionalityPanel,
sensitivityBoxX,
- sensitivityBoxY,
+ VertHorzRatioBox,
rotationBox,
weightBoxX,
weightBoxY,
@@ -135,8 +135,8 @@ namespace grapher
constantThreeLabelY,
ActiveValueTitle,
ActiveValueTitleY,
- SensitivityActiveXLabel,
- SensitivityActiveYLabel,
+ SensitivityMultiplierActiveLabel,
+ VertHorzRatioActiveLabel,
RotationActiveLabel,
WeightActiveXLabel,
WeightActiveYLabel,
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 6ad57d9..801fd8d 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -113,12 +113,12 @@ namespace grapher
var settings = new Profile();
settings.rotation = ApplyOptions.Rotation.Field.Data;
- settings.sensitivity = ApplyOptions.Sensitivity.Fields.X;
+ settings.sensitivity = ApplyOptions.Sensitivity.Field.Data;
// TODO - separate sensitivity fields, add new label for ratio
settings.yxSensRatio = ApplyOptions.Sensitivity.Fields.Y;
settings.combineMagnitudes = ApplyOptions.IsWhole;
- ApplyOptions.SetArgs(ref settings.argsX, ref settings.argsY);
+ ApplyOptions.SetArgsFromActiveValues(ref settings.argsX, ref settings.argsY);
var (domWeights, lpNorm) = ApplyOptions.Directionality.GetDomainArgs();
settings.domainXY = domWeights;
diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs
index 75eb017..3451402 100644
--- a/grapher/Models/Options/AccelOptionSet.cs
+++ b/grapher/Models/Options/AccelOptionSet.cs
@@ -99,7 +99,7 @@ namespace grapher.Models.Options
Options.Top = TopAnchor;
}
- public void SetArgs(ref AccelArgs args)
+ public void SetArgsFromActiveValues(ref AccelArgs args)
{
Options.SetArgs(ref args);
}
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 0d87943..5c3494c 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -65,7 +65,9 @@ namespace grapher.Models.Options
public DirectionalityOptions Directionality { get; }
- public OptionXY Sensitivity { get; }
+ public Option Sensitivity { get; }
+
+ public Option YToXRatio { get; }
public Option Rotation { get; }
@@ -81,23 +83,24 @@ namespace grapher.Models.Options
#region Methods
- public void SetArgs(ref AccelArgs argsX, ref AccelArgs argsY)
+ public void SetArgsFromActiveValues(ref AccelArgs argsX, ref AccelArgs argsY)
{
- OptionSetX.SetArgs(ref argsX);
+ OptionSetX.SetArgsFromActiveValues(ref argsX);
if (ByComponentVectorXYLock.Checked)
{
- OptionSetX.SetArgs(ref argsY);
+ OptionSetX.SetArgsFromActiveValues(ref argsY);
}
else
{
- OptionSetY.SetArgs(ref argsY);
+ OptionSetY.SetArgsFromActiveValues(ref argsY);
}
}
public void SetActiveValues(Profile settings)
{
- Sensitivity.SetActiveValues(settings.sensitivity, settings.yxSensRatio);
+ Sensitivity.SetActiveValue(settings.sensitivity);
+ YToXRatio.SetActiveValue(settings.yxSensRatio);
Rotation.SetActiveValue(settings.rotation);
WholeVectorCheckBox.Checked = settings.combineMagnitudes;
diff --git a/grapher/Models/Options/CheckBoxOption.cs b/grapher/Models/Options/CheckBoxOption.cs
index abf96d3..1a4245d 100644
--- a/grapher/Models/Options/CheckBoxOption.cs
+++ b/grapher/Models/Options/CheckBoxOption.cs
@@ -2,6 +2,9 @@
namespace grapher.Models.Options
{
+ /// <summary>
+ /// This is an option type that is just a checkbox.
+ /// </summary>
public class CheckBoxOption : OptionBase
{
public CheckBoxOption(
diff --git a/grapher/Models/Options/LockableOption.cs b/grapher/Models/Options/LockableOption.cs
new file mode 100644
index 0000000..bf77520
--- /dev/null
+++ b/grapher/Models/Options/LockableOption.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace grapher.Models.Options
+{
+ /// <summary>
+ /// This is an option type that is a regular option with a checkbox that disables it.
+ /// </summary>
+ public class LockableOption : OptionBase
+ {
+ public LockableOption(
+ Option option,
+ CheckBox checkBox,
+ int lockedvalue)
+ {
+ Option = option;
+ LockBox = checkBox;
+ LockedValue = lockedvalue;
+ }
+
+ public Option Option { get; }
+
+ public CheckBox LockBox { get; }
+
+ public int LockedValue { get; }
+
+ public override int Left
+ {
+ get => Option.Left;
+
+ set
+ {
+ Option.Left = value;
+ }
+ }
+
+ public override int Top
+ {
+ get => Option.Top;
+
+ set
+ {
+ Option.Top = value;
+ LockBox.Top = value;
+ }
+ }
+
+ public override int Width
+ {
+ get => Option.Width;
+
+ set
+ {
+ Option.Width = value;
+ }
+ }
+
+ public override int Height
+ {
+ get => Option.Height;
+ }
+
+ public override bool Visible
+ {
+ get => Option.Visible;
+ }
+
+ public override void AlignActiveValues()
+ {
+ Option.AlignActiveValues();
+ }
+
+ public override void Hide()
+ {
+ Option.Hide();
+ LockBox.Hide();
+ }
+
+ public override void Show(string Name)
+ {
+ Option.Show(Name);
+ LockBox.Show();
+ }
+ }
+}
diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj
index 9a9412b..abc06df 100644
--- a/grapher/grapher.csproj
+++ b/grapher/grapher.csproj
@@ -137,6 +137,7 @@
<Compile Include="Layouts\PowerLayout.cs" />
<Compile Include="Models\Options\CheckBoxOption.cs" />
<Compile Include="Models\Options\Directionality\DirectionalityOptions.cs" />
+ <Compile Include="Models\Options\LockableOption.cs" />
<Compile Include="Models\Options\LUT\LutApplyOptions.cs" />
<Compile Include="Models\Options\IOption.cs" />
<Compile Include="Models\Options\LUT\LUTPanelOptions.cs" />