diff options
| -rw-r--r-- | grapher/Form1.Designer.cs | 108 | ||||
| -rw-r--r-- | grapher/Form1.cs | 6 | ||||
| -rw-r--r-- | grapher/Layouts/ClassicLayout.cs | 4 | ||||
| -rw-r--r-- | grapher/Layouts/DefaultLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/JumpLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/LUTLayout.cs | 1 | ||||
| -rw-r--r-- | grapher/Layouts/LayoutBase.cs | 8 | ||||
| -rw-r--r-- | grapher/Layouts/LinearLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/MotivityLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/NaturalLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/OffLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/PowerLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/UnsupportedLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/AccelGUIFactory.cs | 20 | ||||
| -rw-r--r-- | grapher/Models/Options/AccelTypeOptions.cs | 39 |
15 files changed, 157 insertions, 45 deletions
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index c114ff6..7cb19fc 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -71,6 +71,8 @@ namespace grapher System.Windows.Forms.DataVisualization.Charting.Title title6 = new System.Windows.Forms.DataVisualization.Charting.Title(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawAcceleration)); this.optionsPanel = new System.Windows.Forms.Panel(); + this.YLutActiveValuesBox = new System.Windows.Forms.RichTextBox(); + this.XLutActiveValuesBox = new System.Windows.Forms.RichTextBox(); this.LutApplyActiveYLabel = new System.Windows.Forms.Label(); this.YLutApplyDropdown = new System.Windows.Forms.ComboBox(); this.XLutApplyDropdown = new System.Windows.Forms.ComboBox(); @@ -186,6 +188,7 @@ namespace grapher this.ScaleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showVelocityGainToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showLastMouseMoveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.streamingModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutoWriteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UseSpecificDeviceMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -196,9 +199,12 @@ 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.streamingModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.XLutActiveValuesBox = new System.Windows.Forms.RichTextBox(); - this.YLutActiveValuesBox = new System.Windows.Forms.RichTextBox(); + this.powerBoxX = new System.Windows.Forms.TextBox(); + this.powerBoxY = new System.Windows.Forms.TextBox(); + this.powerLabelX = new System.Windows.Forms.Label(); + this.powerLabelY = new System.Windows.Forms.Label(); + this.PowerClassicActiveXLabel = new System.Windows.Forms.Label(); + this.PowerClassicActiveYLabel = new System.Windows.Forms.Label(); this.optionsPanel.SuspendLayout(); this.DirectionalityPanel.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -214,6 +220,12 @@ namespace grapher // optionsPanel // this.optionsPanel.AutoSize = true; + this.optionsPanel.Controls.Add(this.PowerClassicActiveYLabel); + this.optionsPanel.Controls.Add(this.PowerClassicActiveXLabel); + this.optionsPanel.Controls.Add(this.powerLabelY); + this.optionsPanel.Controls.Add(this.powerLabelX); + this.optionsPanel.Controls.Add(this.powerBoxY); + this.optionsPanel.Controls.Add(this.powerBoxX); this.optionsPanel.Controls.Add(this.YLutActiveValuesBox); this.optionsPanel.Controls.Add(this.XLutActiveValuesBox); this.optionsPanel.Controls.Add(this.LutApplyActiveYLabel); @@ -310,6 +322,22 @@ namespace grapher this.optionsPanel.Size = new System.Drawing.Size(483, 956); this.optionsPanel.TabIndex = 34; // + // YLutActiveValuesBox + // + this.YLutActiveValuesBox.Location = new System.Drawing.Point(397, 369); + this.YLutActiveValuesBox.Name = "YLutActiveValuesBox"; + this.YLutActiveValuesBox.Size = new System.Drawing.Size(73, 72); + this.YLutActiveValuesBox.TabIndex = 169; + this.YLutActiveValuesBox.Text = ""; + // + // XLutActiveValuesBox + // + this.XLutActiveValuesBox.Location = new System.Drawing.Point(317, 369); + this.XLutActiveValuesBox.Name = "XLutActiveValuesBox"; + this.XLutActiveValuesBox.Size = new System.Drawing.Size(68, 72); + this.XLutActiveValuesBox.TabIndex = 168; + this.XLutActiveValuesBox.Text = ""; + // // LutApplyActiveYLabel // this.LutApplyActiveYLabel.AutoSize = true; @@ -1329,6 +1357,13 @@ namespace grapher this.showLastMouseMoveToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.showLastMouseMoveToolStripMenuItem.Text = "Show Last Mouse Move"; // + // streamingModeToolStripMenuItem + // + this.streamingModeToolStripMenuItem.CheckOnClick = true; + this.streamingModeToolStripMenuItem.Name = "streamingModeToolStripMenuItem"; + this.streamingModeToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.streamingModeToolStripMenuItem.Text = "Streaming Mode"; + // // advancedToolStripMenuItem // this.advancedToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1605,28 +1640,55 @@ namespace grapher title6.Text = "Sensitivity"; this.AccelerationChart.Titles.Add(title6); // - // streamingModeToolStripMenuItem + // powerBoxX // - this.streamingModeToolStripMenuItem.CheckOnClick = true; - this.streamingModeToolStripMenuItem.Name = "streamingModeToolStripMenuItem"; - this.streamingModeToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.streamingModeToolStripMenuItem.Text = "Streaming Mode"; + this.powerBoxX.Location = new System.Drawing.Point(106, 595); + this.powerBoxX.Name = "powerBoxX"; + this.powerBoxX.Size = new System.Drawing.Size(76, 20); + this.powerBoxX.TabIndex = 170; // - // XLutActiveValuesBox + // powerBoxY // - this.XLutActiveValuesBox.Location = new System.Drawing.Point(317, 369); - this.XLutActiveValuesBox.Name = "XLutActiveValuesBox"; - this.XLutActiveValuesBox.Size = new System.Drawing.Size(68, 72); - this.XLutActiveValuesBox.TabIndex = 168; - this.XLutActiveValuesBox.Text = ""; + this.powerBoxY.Location = new System.Drawing.Point(332, 594); + this.powerBoxY.Name = "powerBoxY"; + this.powerBoxY.Size = new System.Drawing.Size(76, 20); + this.powerBoxY.TabIndex = 171; // - // YLutActiveValuesBox + // powerLabelX // - this.YLutActiveValuesBox.Location = new System.Drawing.Point(397, 369); - this.YLutActiveValuesBox.Name = "YLutActiveValuesBox"; - this.YLutActiveValuesBox.Size = new System.Drawing.Size(73, 72); - this.YLutActiveValuesBox.TabIndex = 169; - this.YLutActiveValuesBox.Text = ""; + this.powerLabelX.AutoSize = true; + this.powerLabelX.Location = new System.Drawing.Point(41, 594); + this.powerLabelX.Name = "powerLabelX"; + this.powerLabelX.Size = new System.Drawing.Size(35, 13); + this.powerLabelX.TabIndex = 172; + this.powerLabelX.Text = "label1"; + // + // powerLabelY + // + this.powerLabelY.AutoSize = true; + this.powerLabelY.Location = new System.Drawing.Point(266, 600); + this.powerLabelY.Name = "powerLabelY"; + this.powerLabelY.Size = new System.Drawing.Size(35, 13); + this.powerLabelY.TabIndex = 173; + this.powerLabelY.Text = "label2"; + // + // PowerClassicActiveXLabel + // + this.PowerClassicActiveXLabel.AutoSize = true; + this.PowerClassicActiveXLabel.Location = new System.Drawing.Point(200, 599); + this.PowerClassicActiveXLabel.Name = "PowerClassicActiveXLabel"; + this.PowerClassicActiveXLabel.Size = new System.Drawing.Size(13, 13); + this.PowerClassicActiveXLabel.TabIndex = 174; + this.PowerClassicActiveXLabel.Text = "0"; + // + // PowerClassicActiveYLabel + // + this.PowerClassicActiveYLabel.AutoSize = true; + this.PowerClassicActiveYLabel.Location = new System.Drawing.Point(417, 599); + this.PowerClassicActiveYLabel.Name = "PowerClassicActiveYLabel"; + this.PowerClassicActiveYLabel.Size = new System.Drawing.Size(13, 13); + this.PowerClassicActiveYLabel.TabIndex = 175; + this.PowerClassicActiveYLabel.Text = "0"; // // RawAcceleration // @@ -1786,6 +1848,12 @@ namespace grapher private System.Windows.Forms.RichTextBox YLutActiveValuesBox; private System.Windows.Forms.RichTextBox XLutActiveValuesBox; private System.Windows.Forms.ToolStripMenuItem streamingModeToolStripMenuItem; + private System.Windows.Forms.Label powerLabelY; + private System.Windows.Forms.Label powerLabelX; + private System.Windows.Forms.TextBox powerBoxY; + private System.Windows.Forms.TextBox powerBoxX; + private System.Windows.Forms.Label PowerClassicActiveYLabel; + private System.Windows.Forms.Label PowerClassicActiveXLabel; } } 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, diff --git a/grapher/Layouts/ClassicLayout.cs b/grapher/Layouts/ClassicLayout.cs index ca9195e..dd1a7d3 100644 --- a/grapher/Layouts/ClassicLayout.cs +++ b/grapher/Layouts/ClassicLayout.cs @@ -17,10 +17,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(true, Weight); OffsetLayout = new OptionLayout(true, Offset); LimitLayout = new OptionLayout(false, string.Empty); - ExponentLayout = new OptionLayout(true, Exponent); + PowerClassicLayout = new OptionLayout(true, PowerClassic); + ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs index 055536a..d6a5f45 100644 --- a/grapher/Layouts/DefaultLayout.cs +++ b/grapher/Layouts/DefaultLayout.cs @@ -18,10 +18,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(true, Weight); OffsetLayout = new OptionLayout(true, Offset); LimitLayout = new OptionLayout(true, Limit); + PowerClassicLayout = new OptionLayout(true, PowerClassic); ExponentLayout = new OptionLayout(true, Exponent); MidpointLayout = new OptionLayout(true, Midpoint); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/JumpLayout.cs b/grapher/Layouts/JumpLayout.cs index 4e34ef3..afb0d72 100644 --- a/grapher/Layouts/JumpLayout.cs +++ b/grapher/Layouts/JumpLayout.cs @@ -18,10 +18,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, Weight); OffsetLayout = new OptionLayout(true, Offset); LimitLayout = new OptionLayout(false, Limit); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 1e0037f..cf4d383 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -26,6 +26,7 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, Weight); OffsetLayout = new OptionLayout(false, Offset); LimitLayout = new OptionLayout(false, string.Empty); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(true, string.Empty); diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index db914dc..bc95d8d 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -7,6 +7,7 @@ namespace grapher.Layouts public const string Acceleration = "Acceleration"; public const string Scale = "Scale"; public const string Exponent = "Exponent"; + public const string PowerClassic = "Power"; public const string Limit = "Limit"; public const string Midpoint = "Midpoint"; public const string Motivity = "Motivity"; @@ -26,6 +27,7 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, string.Empty); OffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); @@ -56,6 +58,8 @@ namespace grapher.Layouts protected OptionLayout LimitLayout { get; set; } + protected OptionLayout PowerClassicLayout { get; set; } + protected OptionLayout ExponentLayout { get; set; } protected OptionLayout MidpointLayout { get; set; } @@ -81,6 +85,7 @@ namespace grapher.Layouts IOption weightOption, IOption offsetOption, IOption limitOption, + IOption powerClassicOption, IOption expOption, IOption midpointOption, IOption lutTextOption, @@ -99,6 +104,7 @@ namespace grapher.Layouts (WeightLayout, weightOption), (OffsetLayout, offsetOption), (LimitLayout, limitOption), + (PowerClassicLayout, powerClassicOption), (ExponentLayout, expOption), (MidpointLayout, midpointOption), (LutTextLayout, lutTextOption), @@ -131,6 +137,7 @@ namespace grapher.Layouts IOption weightOption, IOption offsetOption, IOption limitOption, + IOption powerClassicOption, IOption expOption, IOption midpointOption, IOption lutTextOption, @@ -144,6 +151,7 @@ namespace grapher.Layouts weightOption, offsetOption, limitOption, + powerClassicOption, expOption, midpointOption, lutTextOption, diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs index 6447833..62d6f77 100644 --- a/grapher/Layouts/LinearLayout.cs +++ b/grapher/Layouts/LinearLayout.cs @@ -20,10 +20,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, Weight); OffsetLayout = new OptionLayout(true, Offset); LimitLayout = new OptionLayout(false, string.Empty); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/MotivityLayout.cs b/grapher/Layouts/MotivityLayout.cs index 7ab2f3f..17b4369 100644 --- a/grapher/Layouts/MotivityLayout.cs +++ b/grapher/Layouts/MotivityLayout.cs @@ -23,10 +23,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, string.Empty); OffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(true, Motivity); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(true, Midpoint); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs index 245a37b..97aef34 100644 --- a/grapher/Layouts/NaturalLayout.cs +++ b/grapher/Layouts/NaturalLayout.cs @@ -18,10 +18,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(true, Weight); OffsetLayout = new OptionLayout(true, Offset); LimitLayout = new OptionLayout(true, Limit); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs index 16e5c19..e8f8565 100644 --- a/grapher/Layouts/OffLayout.cs +++ b/grapher/Layouts/OffLayout.cs @@ -18,10 +18,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, string.Empty); OffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs index bf40c24..a09bf9f 100644 --- a/grapher/Layouts/PowerLayout.cs +++ b/grapher/Layouts/PowerLayout.cs @@ -16,10 +16,12 @@ WeightLayout = new OptionLayout(true, Weight); OffsetLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(true, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } } diff --git a/grapher/Layouts/UnsupportedLayout.cs b/grapher/Layouts/UnsupportedLayout.cs index c17812d..04f0e55 100644 --- a/grapher/Layouts/UnsupportedLayout.cs +++ b/grapher/Layouts/UnsupportedLayout.cs @@ -23,10 +23,12 @@ namespace grapher.Layouts WeightLayout = new OptionLayout(false, Weight); OffsetLayout = new OptionLayout(false, Offset); LimitLayout = new OptionLayout(false, string.Empty); + PowerClassicLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(true, LUTLayoutText); LutPanelLayout = new OptionLayout(false, string.Empty); + LutApplyOptionsLayout = new OptionLayout(false, string.Empty); } } }
\ No newline at end of file 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, diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index f97df2d..169426d 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -36,6 +36,7 @@ namespace grapher Option weight, Option offset, Option limit, + Option powerClassic, Option exponent, Option midpoint, TextOption lutText, @@ -68,6 +69,7 @@ namespace grapher Weight = weight; Offset = offset; Limit = limit; + PowerClassic = powerClassic; Exponent = exponent; Midpoint = midpoint; WriteButton = writeButton; @@ -113,6 +115,12 @@ namespace grapher public Option Limit { get; } + /// <summary> + /// This is the option for the power parameter for Classic style, + /// and has nothing to do with the Power style. + /// </summary> + public Option PowerClassic { get; } + public Option Exponent { get; } public Option Midpoint { get; } @@ -215,6 +223,7 @@ namespace grapher Weight.Hide(); Offset.Hide(); Limit.Hide(); + PowerClassic.Hide(); Exponent.Hide(); Midpoint.Hide(); LutText.Hide(); @@ -245,7 +254,8 @@ namespace grapher Acceleration.SetActiveValue(AccelerationParameterFromArgs(ref args)); Scale.SetActiveValue(args.scale); Limit.SetActiveValue(args.limit); - Exponent.SetActiveValue(ExponentParameterFromArgs(ref args)); + PowerClassic.SetActiveValue(args.power); + Exponent.SetActiveValue(args.exponent); Midpoint.SetActiveValue(args.midpoint); LutPanel.SetActiveValues(args.tableData.points, args.tableData.length); LutApply.SetActiveValue(args.tableData.velocity); @@ -307,17 +317,8 @@ namespace grapher if (Scale.Visible) args.scale = Scale.Field.Data; if (Cap.Visible) args.cap = Cap.Field.Data; if (Limit.Visible) args.limit = Limit.Field.Data; - if (Exponent.Visible) - { - if (args.mode == AccelMode.classic) - { - args.power = Exponent.Field.Data; - } - else - { - args.exponent = Exponent.Field.Data; - } - } + if (PowerClassic.Visible) args.power = PowerClassic.Field.Data; + if (Exponent.Visible)args.exponent = Exponent.Field.Data; if (Offset.Visible) args.offset = Offset.Field.Data; if (Midpoint.Visible) args.midpoint = Midpoint.Field.Data; if (Weight.Visible) args.weight = Weight.Field.Data; @@ -340,6 +341,7 @@ namespace grapher Offset.AlignActiveValues(); Weight.AlignActiveValues(); Limit.AlignActiveValues(); + PowerClassic.AlignActiveValues(); Exponent.AlignActiveValues(); Midpoint.AlignActiveValues(); LutApply.AlignActiveValues(); @@ -375,6 +377,7 @@ namespace grapher Weight, Offset, Limit, + PowerClassic, Exponent, Midpoint, LutText, @@ -423,18 +426,6 @@ namespace grapher } } - private double ExponentParameterFromArgs(ref AccelArgs args) - { - if (args.mode == AccelMode.classic) - { - return args.power; - } - else - { - return args.exponent; - } - } - #endregion Methods } } |