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/Models/AccelGUIFactory.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 1c42c76..c8446f0 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -85,6 +85,7 @@ namespace grapher.Models Label limitLabelY, Label expLabelX, Label expLabelY, + Label lutTextLabel, Label constantThreeLabelX, Label constantThreeLabelY, Label activeValueTitleX, @@ -332,6 +333,8 @@ namespace grapher.Models legacyCapToolStripMenuItem, capY); + var lutText = new TextOption(lutTextLabel); + var accelerationOptionsX = new AccelTypeOptions( accelTypeDropX, accelerationX, @@ -342,6 +345,7 @@ namespace grapher.Models limitX, exponentX, midpointX, + lutText, writeButton, new ActiveValueLabel(accelTypeActiveLabelX, activeValueTitleX)); @@ -355,6 +359,7 @@ namespace grapher.Models limitY, exponentY, midpointY, + lutText, writeButton, new ActiveValueLabel(accelTypeActiveLabelY, activeValueTitleY)); -- 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/Models/AccelGUIFactory.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index c8446f0..e3a16b6 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -85,7 +85,8 @@ namespace grapher.Models Label limitLabelY, Label expLabelX, Label expLabelY, - Label lutTextLabel, + Label lutTextLabelX, + Label lutTextLabelY, Label constantThreeLabelX, Label constantThreeLabelY, Label activeValueTitleX, @@ -333,7 +334,8 @@ namespace grapher.Models legacyCapToolStripMenuItem, capY); - var lutText = new TextOption(lutTextLabel); + var lutTextX = new TextOption(lutTextLabelX); + var lutTextY = new TextOption(lutTextLabelY); var accelerationOptionsX = new AccelTypeOptions( accelTypeDropX, @@ -345,7 +347,7 @@ namespace grapher.Models limitX, exponentX, midpointX, - lutText, + lutTextX, writeButton, new ActiveValueLabel(accelTypeActiveLabelX, activeValueTitleX)); @@ -359,7 +361,7 @@ namespace grapher.Models limitY, exponentY, midpointY, - lutText, + lutTextY, writeButton, new ActiveValueLabel(accelTypeActiveLabelY, activeValueTitleY)); -- 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/Models/AccelGUIFactory.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index e3a16b6..6e03293 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -68,6 +68,8 @@ namespace grapher.Models CheckBox fakeBox, CheckBox wholeCheckBox, CheckBox byComponentCheckBox, + CheckBox gainSwitchX, + CheckBox gainSwitchY, Label lockXYLabel, Label sensitivityLabel, Label rotationLabel, @@ -336,9 +338,12 @@ namespace grapher.Models var lutTextX = new TextOption(lutTextLabelX); var lutTextY = new TextOption(lutTextLabelY); + var gainSwitchOptionX = new CheckBoxOption(gainSwitchX); + var gainSwitchOptionY = new CheckBoxOption(gainSwitchY); var accelerationOptionsX = new AccelTypeOptions( accelTypeDropX, + gainSwitchOptionX, accelerationX, scaleX, capOptionsX, @@ -353,6 +358,7 @@ namespace grapher.Models var accelerationOptionsY = new AccelTypeOptions( accelTypeDropY, + gainSwitchOptionY, accelerationY, scaleY, capOptionsY, -- cgit v1.2.3 From aba8e7757da8d2a542415257ac845f40f28f78a0 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 23:52:46 -0700 Subject: Resize vertically for correctness --- grapher/Models/AccelGUIFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 6e03293..de2d99c 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -394,7 +394,7 @@ namespace grapher.Models range, wholeCheckBox, byComponentCheckBox, - 260); + Constants.DirectionalityVerticalOffset); var applyOptions = new ApplyOptions( byComponentXYLock, -- 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/Models/AccelGUIFactory.cs | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index de2d99c..6bfc510 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -29,10 +29,6 @@ namespace grapher.Models ButtonBase toggleButton, ToolStripMenuItem showVelocityGainToolStripMenuItem, ToolStripMenuItem showLastMouseMoveMenuItem, - ToolStripMenuItem velocityGainCapToolStripMenuItem, - ToolStripMenuItem legacyCapToolStripMenuItem, - ToolStripMenuItem gainOffsetToolStripMenuItem, - ToolStripMenuItem legacyOffsetToolStripMenuItem, ToolStripMenuItem autoWriteMenuItem, ToolStripMenuItem useSpecificDeviceMenuItem, ToolStripMenuItem scaleMenuItem, @@ -226,16 +222,6 @@ namespace grapher.Models new ActiveValueLabel(offsetActiveLabelY, activeValueTitleY), "Offset"); - var offsetOptionsX = new OffsetOptions( - gainOffsetToolStripMenuItem, - legacyOffsetToolStripMenuItem, - offsetX); - - var offsetOptionsY = new OffsetOptions( - gainOffsetToolStripMenuItem, - legacyOffsetToolStripMenuItem, - offsetY); - var accelerationX = new Option( new Field(accelerationBoxX, form, 0), constantOneLabelX, @@ -326,15 +312,6 @@ namespace grapher.Models new ActiveValueLabel(rangeActiveValueY, direcionalityActiveValueTitle)), false); - var capOptionsX = new CapOptions( - velocityGainCapToolStripMenuItem, - legacyCapToolStripMenuItem, - capX); - - var capOptionsY = new CapOptions( - velocityGainCapToolStripMenuItem, - legacyCapToolStripMenuItem, - capY); var lutTextX = new TextOption(lutTextLabelX); var lutTextY = new TextOption(lutTextLabelY); @@ -346,9 +323,9 @@ namespace grapher.Models gainSwitchOptionX, accelerationX, scaleX, - capOptionsX, + capX, weightX, - offsetOptionsX, + offsetX, limitX, exponentX, midpointX, @@ -361,9 +338,9 @@ namespace grapher.Models gainSwitchOptionY, accelerationY, scaleY, - capOptionsY, + capY, weightY, - offsetOptionsY, + offsetY, limitY, exponentY, midpointY, -- 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/Models/AccelGUIFactory.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 6bfc510..73be939 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -110,6 +110,8 @@ namespace grapher.Models Label midpointActiveLabelY, Label accelTypeActiveLabelX, Label accelTypeActiveLabelY, + Label gainSwitchActiveLabelX, + Label gainSwitchActiveLabelY, Label optionSetXTitle, Label optionSetYTitle, Label mouseLabel, @@ -315,8 +317,12 @@ namespace grapher.Models var lutTextX = new TextOption(lutTextLabelX); var lutTextY = new TextOption(lutTextLabelY); - var gainSwitchOptionX = new CheckBoxOption(gainSwitchX); - var gainSwitchOptionY = new CheckBoxOption(gainSwitchY); + var gainSwitchOptionX = new CheckBoxOption( + gainSwitchX, + new ActiveValueLabel(gainSwitchActiveLabelX, activeValueTitleX)); + var gainSwitchOptionY = new CheckBoxOption( + gainSwitchY, + new ActiveValueLabel(gainSwitchActiveLabelY, activeValueTitleY)); var accelerationOptionsX = new AccelTypeOptions( accelTypeDropX, -- 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/Models/AccelGUIFactory.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 73be939..5035598 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -3,6 +3,7 @@ using grapher.Models.Devices; using grapher.Models.Mouse; using grapher.Models.Options; using grapher.Models.Options.Directionality; +using grapher.Models.Options.LUT; using grapher.Models.Serialized; using System; using System.Windows.Forms; @@ -66,6 +67,8 @@ namespace grapher.Models CheckBox byComponentCheckBox, CheckBox gainSwitchX, CheckBox gainSwitchY, + Panel lutPanelX, + Panel lutPanelY, Label lockXYLabel, Label sensitivityLabel, Label rotationLabel, @@ -336,6 +339,7 @@ namespace grapher.Models exponentX, midpointX, lutTextX, + new LUTPanelOptions(lutPanelX), writeButton, new ActiveValueLabel(accelTypeActiveLabelX, activeValueTitleX)); @@ -351,6 +355,7 @@ namespace grapher.Models exponentY, midpointY, lutTextY, + new LUTPanelOptions(lutPanelY), writeButton, new ActiveValueLabel(accelTypeActiveLabelY, activeValueTitleY)); -- 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/Models/AccelGUIFactory.cs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 5035598..b82cf59 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -26,6 +26,8 @@ namespace grapher.Models Chart gainChartY, ComboBox accelTypeDropX, ComboBox accelTypeDropY, + ComboBox lutApplyDropdownX, + ComboBox lutApplyDropdownY, Button writeButton, ButtonBase toggleButton, ToolStripMenuItem showVelocityGainToolStripMenuItem, @@ -69,6 +71,8 @@ namespace grapher.Models CheckBox gainSwitchY, Panel lutPanelX, Panel lutPanelY, + RichTextBox xLutPointsBox, + RichTextBox yLutPointsBox, Label lockXYLabel, Label sensitivityLabel, Label rotationLabel, @@ -129,7 +133,11 @@ namespace grapher.Models Label domainActiveValueY, Label rangeLabel, Label rangeActiveValueX, - Label rangeActiveValueY) + Label rangeActiveValueY, + Label lutApplyLabelX, + Label lutApplyLabelY, + Label lutApplyActiveValueX, + Label lutApplyActiveValueY) { fakeBox.Checked = false; fakeBox.Hide(); @@ -339,7 +347,11 @@ namespace grapher.Models exponentX, midpointX, lutTextX, - new LUTPanelOptions(lutPanelX), + new LUTPanelOptions(lutPanelX, xLutPointsBox), + new LutApplyOptions( + lutApplyLabelX, + lutApplyDropdownX, + new ActiveValueLabel(lutApplyActiveValueX, activeValueTitleX)), writeButton, new ActiveValueLabel(accelTypeActiveLabelX, activeValueTitleX)); @@ -355,7 +367,11 @@ namespace grapher.Models exponentY, midpointY, lutTextY, - new LUTPanelOptions(lutPanelY), + new LUTPanelOptions(lutPanelY, yLutPointsBox), + new LutApplyOptions( + lutApplyLabelY, + lutApplyDropdownY, + new ActiveValueLabel(lutApplyActiveValueY, activeValueTitleY)), writeButton, new ActiveValueLabel(accelTypeActiveLabelY, activeValueTitleY)); -- 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/Models/AccelGUIFactory.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index b82cf59..3bb5a49 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -69,8 +69,8 @@ namespace grapher.Models CheckBox byComponentCheckBox, CheckBox gainSwitchX, CheckBox gainSwitchY, - Panel lutPanelX, - Panel lutPanelY, + RichTextBox xLutActiveValuesBox, + RichTextBox yLutActiveValuesBox, RichTextBox xLutPointsBox, RichTextBox yLutPointsBox, Label lockXYLabel, @@ -347,7 +347,7 @@ namespace grapher.Models exponentX, midpointX, lutTextX, - new LUTPanelOptions(lutPanelX, xLutPointsBox), + new LUTPanelOptions(xLutPointsBox, xLutActiveValuesBox), new LutApplyOptions( lutApplyLabelX, lutApplyDropdownX, @@ -367,7 +367,7 @@ namespace grapher.Models exponentY, midpointY, lutTextY, - new LUTPanelOptions(lutPanelY, yLutPointsBox), + new LUTPanelOptions(yLutPointsBox, yLutActiveValuesBox), new LutApplyOptions( lutApplyLabelY, lutApplyDropdownY, -- 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/Models/AccelGUIFactory.cs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 7d33f0c..d424d80 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -54,6 +54,8 @@ namespace grapher.Models TextBox scaleBoxY, TextBox limitBoxX, TextBox limitBoxY, + TextBox powerClassicBoxX, + TextBox powerClassicBoxY, TextBox expBoxX, TextBox expBoxY, TextBox midpointBoxX, @@ -89,6 +91,8 @@ namespace grapher.Models Label scaleLabelY, Label limitLabelX, Label limitLabelY, + Label powerClassicLabelX, + Label powerClassicLabelY, Label expLabelX, Label expLabelY, Label lutTextLabelX, @@ -112,6 +116,8 @@ namespace grapher.Models Label scaleActiveLabelY, Label limitActiveLabelX, Label limitActiveLabelY, + Label powerClassicActiveLabelX, + Label powerClassicActiveLabelY, Label expActiveLabelX, Label expActiveLabelY, Label midpointActiveLabelX, @@ -273,6 +279,18 @@ namespace grapher.Models new ActiveValueLabel(limitActiveLabelY, activeValueTitleY), optionSetYLeft); + var powerClassicX = new Option( + new Field(powerClassicBoxX, form, 2), + powerClassicLabelX, + new ActiveValueLabel(powerClassicActiveLabelX, activeValueTitleX), + 0); + + var powerClassicY = new Option( + new Field(powerClassicBoxY, form, 2), + powerClassicLabelY, + new ActiveValueLabel(powerClassicActiveLabelY, activeValueTitleY), + optionSetYLeft); + var exponentX = new Option( new Field(expBoxX, form, 2), expLabelX, @@ -346,6 +364,7 @@ namespace grapher.Models weightX, offsetX, limitX, + powerClassicX, exponentX, midpointX, lutTextX, @@ -366,6 +385,7 @@ namespace grapher.Models weightY, offsetY, limitY, + powerClassicX, exponentY, midpointY, lutTextY, -- cgit v1.2.3 From cc6d1e3722697b85773db57c516ebb6dbfda8edf Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 9 Jul 2021 17:16:43 -0700 Subject: Small bugfix + add default text for LUT --- grapher/Models/AccelGUIFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index d424d80..39119e7 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -385,7 +385,7 @@ namespace grapher.Models weightY, offsetY, limitY, - powerClassicX, + powerClassicY, exponentY, midpointY, lutTextY, -- 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/Models/AccelGUIFactory.cs | 60 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 39119e7..c584773 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -50,6 +50,12 @@ namespace grapher.Models TextBox offsetBoxY, TextBox accelerationBoxX, TextBox accelerationBoxY, + TextBox decayRateBoxX, + TextBox decayRateBoxY, + TextBox growthRateBoxX, + TextBox growthRateBoxY, + TextBox smoothBoxX, + TextBox smoothBoxY, TextBox scaleBoxX, TextBox scaleBoxY, TextBox limitBoxX, @@ -87,6 +93,12 @@ namespace grapher.Models Label offsetLabelY, Label constantOneLabelX, Label constantOneLabelY, + Label decayRateLabelX, + Label decayRateLabelY, + Label growthRateLabelX, + Label growthRateLabelY, + Label smoothLabelX, + Label smoothLabelY, Label scaleLabelX, Label scaleLabelY, Label limitLabelX, @@ -112,6 +124,12 @@ namespace grapher.Models Label offsetActiveLabelY, Label accelerationActiveLabelX, Label accelerationActiveLabelY, + Label decayRateActiveLabelX, + Label decayRateActiveLabelY, + Label growthRateActiveLabelX, + Label growthRateActiveLabelY, + Label smoothActiveLabelX, + Label smoothActiveLabelY, Label scaleActiveLabelX, Label scaleActiveLabelY, Label limitActiveLabelX, @@ -255,6 +273,42 @@ namespace grapher.Models new ActiveValueLabel(accelerationActiveLabelY, activeValueTitleY), optionSetYLeft); + var decayRateX = new Option( + new Field(decayRateBoxX, form, 0), + decayRateLabelX, + new ActiveValueLabel(decayRateActiveLabelX, activeValueTitleX), + 0); + + var decayRateY = new Option( + new Field(decayRateBoxY, form, 0), + decayRateLabelY, + new ActiveValueLabel(decayRateActiveLabelY, activeValueTitleY), + 0); + + var growthRateX = new Option( + new Field(growthRateBoxX, form, 0), + growthRateLabelX, + new ActiveValueLabel(growthRateActiveLabelX, activeValueTitleX), + 0); + + var growthRateY = new Option( + new Field(growthRateBoxY, form, 0), + growthRateLabelY, + new ActiveValueLabel(growthRateActiveLabelY, activeValueTitleY), + 0); + + var smoothX = new Option( + new Field(smoothBoxX, form, 0), + smoothLabelX, + new ActiveValueLabel(smoothActiveLabelX, activeValueTitleX), + 0); + + var smoothY = new Option( + new Field(smoothBoxY, form, 0), + smoothLabelY, + new ActiveValueLabel(smoothActiveLabelY, activeValueTitleY), + 0); + var scaleX = new Option( new Field(scaleBoxX, form, 0), scaleLabelX, @@ -359,6 +413,9 @@ namespace grapher.Models accelTypeDropX, gainSwitchOptionX, accelerationX, + decayRateX, + growthRateX, + smoothX, scaleX, capX, weightX, @@ -380,6 +437,9 @@ namespace grapher.Models accelTypeDropY, gainSwitchOptionY, accelerationY, + decayRateY, + growthRateY, + smoothY, scaleY, capY, weightY, -- cgit v1.2.3 From ed3ee378aaf7438b688cab7af1235af4eff023ca Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sat, 10 Jul 2021 16:36:26 -0700 Subject: Small bug fixes --- grapher/Models/AccelGUIFactory.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grapher/Models/AccelGUIFactory.cs') diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index c584773..7e5ae9b 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -203,7 +203,7 @@ namespace grapher.Models new ActiveValueLabel(rotationActiveLabel, activeValueTitleX), "Rotation"); - var optionSetYLeft = rotation.Left + rotation.Width; + var optionSetYLeft = activeValueTitleX.Left + activeValueTitleX.Width; var directionalityLeft = directionalityPanel.Left; @@ -283,7 +283,7 @@ namespace grapher.Models new Field(decayRateBoxY, form, 0), decayRateLabelY, new ActiveValueLabel(decayRateActiveLabelY, activeValueTitleY), - 0); + optionSetYLeft); var growthRateX = new Option( new Field(growthRateBoxX, form, 0), @@ -295,7 +295,7 @@ namespace grapher.Models new Field(growthRateBoxY, form, 0), growthRateLabelY, new ActiveValueLabel(growthRateActiveLabelY, activeValueTitleY), - 0); + optionSetYLeft); var smoothX = new Option( new Field(smoothBoxX, form, 0), @@ -307,7 +307,7 @@ namespace grapher.Models new Field(smoothBoxY, form, 0), smoothLabelY, new ActiveValueLabel(smoothActiveLabelY, activeValueTitleY), - 0); + optionSetYLeft); var scaleX = new Option( new Field(scaleBoxX, form, 0), -- cgit v1.2.3