mirrors/rawaccel
1
0
Fork 0
mirror of https://github.com/RawAccelOfficial/rawaccel.git synced 2025-05-11 10:26:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename motivity mode to synchronous, midpoint value to syncspeed

Browse source
This commit is contained in:
Jacob Palecki 2024-07-13 01:16:21 -07:00
parent 428f4e8b49
commit 73d602cbc9
22 changed files with 124 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/accel-motivity.hpp → common/accel-synchronous.hpp
View file

@ -4,10 +4,10 @@
namespace rawaccel { namespace rawaccel {
template <bool Gain> struct loglog_sigmoid; template <bool Gain> struct activation_framework;
template <> template <>
struct loglog_sigmoid<LEGACY> { struct activation_framework<LEGACY> {
double log_motivity; double log_motivity;
double gamma_const; double gamma_const;
double log_syncspeed; double log_syncspeed;
@ -18,7 +18,7 @@ namespace rawaccel {
double minimum_sens; double minimum_sens;
double maximum_sens; double maximum_sens;
loglog_sigmoid(const accel_args& args) : activation_framework(const accel_args& args) :
log_motivity(log(args.motivity)), log_motivity(log(args.motivity)),
gamma_const(args.gamma / log_motivity), gamma_const(args.gamma / log_motivity),
log_syncspeed(log(args.sync_speed)), log_syncspeed(log(args.sync_speed)),
@ -73,20 +73,20 @@ namespace rawaccel {
}; };
template <> template <>
struct loglog_sigmoid<GAIN> { struct activation_framework<GAIN> {
enum { capacity = LUT_RAW_DATA_CAPACITY }; enum { capacity = LUT_RAW_DATA_CAPACITY };
bool velocity; bool velocity;
fp_rep_range range; fp_rep_range range;
double x_start; double x_start;
loglog_sigmoid(const accel_args& args) activation_framework(const accel_args& args)
{ {
init({ -3, 9, 8 }, true); init({ -3, 9, 8 }, true);
double sum = 0; double sum = 0;
double a = 0; double a = 0;
auto sig = loglog_sigmoid<LEGACY>(args); auto sig = activation_framework<LEGACY>(args);
auto sigmoid_sum = [&](double b) { auto sigmoid_sum = [&](double b) {
int partitions = 2; int partitions = 2;

20
common/accel-union.hpp
View file

@ -3,7 +3,7 @@
#include "accel-classic.hpp" #include "accel-classic.hpp"
#include "accel-jump.hpp" #include "accel-jump.hpp"
#include "accel-lookup.hpp" #include "accel-lookup.hpp"
#include "accel-motivity.hpp" #include "accel-synchronous.hpp"
#include "accel-natural.hpp" #include "accel-natural.hpp"
#include "accel-noaccel.hpp" #include "accel-noaccel.hpp"
#include "accel-power.hpp" #include "accel-power.hpp"
@ -21,8 +21,8 @@ namespace rawaccel {
natural<LEGACY> natural_l; natural<LEGACY> natural_l;
power<GAIN> power_g; power<GAIN> power_g;
power<LEGACY> power_l; power<LEGACY> power_l;
loglog_sigmoid<GAIN> loglog_sigmoid_g; activation_framework<GAIN> loglog_sigmoid_g;
loglog_sigmoid<LEGACY> loglog_sigmoid_l; activation_framework<LEGACY> loglog_sigmoid_l;
template <template <bool> class AccelTemplate, typename Visitor> template <template <bool> class AccelTemplate, typename Visitor>
auto visit_helper(Visitor vis, bool gain) auto visit_helper(Visitor vis, bool gain)
@ -35,13 +35,13 @@ namespace rawaccel {
auto visit(Visitor vis, const accel_args& args) auto visit(Visitor vis, const accel_args& args)
{ {
switch (args.mode) { switch (args.mode) {
case accel_mode::classic: return visit_helper<classic>(vis, args.gain); case accel_mode::classic: return visit_helper<classic>(vis, args.gain);
case accel_mode::jump: return visit_helper<jump>(vis, args.gain); case accel_mode::jump: return visit_helper<jump>(vis, args.gain);
case accel_mode::natural: return visit_helper<natural>(vis, args.gain); case accel_mode::natural: return visit_helper<natural>(vis, args.gain);
case accel_mode::motivity: return visit_helper<loglog_sigmoid>(vis, args.gain); case accel_mode::synchronous: return visit_helper<activation_framework>(vis, args.gain);
case accel_mode::power: return visit_helper<power>(vis, args.gain); case accel_mode::power: return visit_helper<power>(vis, args.gain);
case accel_mode::lookup: return vis(lut); case accel_mode::lookup: return vis(lut);
default: return vis(noaccel); default: return vis(noaccel);
} }
} }

2
common/common.vcxitems
View file

@ -17,7 +17,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-jump.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-jump.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-lookup.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-lookup.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-motivity.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-synchronous.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-noaccel.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-noaccel.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)accel-power.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-power.hpp" />

2
common/rawaccel-base.hpp
View file

@ -31,7 +31,7 @@ namespace rawaccel {
classic, classic,
jump, jump,
natural, natural,
motivity, synchronous,
power, power,
lookup, lookup,
noaccel noaccel

76
grapher/Form1.Designer.cs generated
View file

@ -160,14 +160,14 @@ namespace grapher
this.inCapLabelYClassic = new System.Windows.Forms.Label(); this.inCapLabelYClassic = new System.Windows.Forms.Label();
this.constantOneLabelY = new System.Windows.Forms.Label(); this.constantOneLabelY = new System.Windows.Forms.Label();
this.ByComponentXYLock = new System.Windows.Forms.CheckBox(); this.ByComponentXYLock = new System.Windows.Forms.CheckBox();
this.MidpointActiveYLabel = new System.Windows.Forms.Label(); this.SyncSpeedActiveYLabel = new System.Windows.Forms.Label();
this.LimitActiveYLabel = new System.Windows.Forms.Label(); this.LimitActiveYLabel = new System.Windows.Forms.Label();
this.InputJumpActiveYLabel = new System.Windows.Forms.Label(); this.InputJumpActiveYLabel = new System.Windows.Forms.Label();
this.OutputJumpActiveYLabel = new System.Windows.Forms.Label(); this.OutputJumpActiveYLabel = new System.Windows.Forms.Label();
this.InputOffsetActiveYLabel = new System.Windows.Forms.Label(); this.InputOffsetActiveYLabel = new System.Windows.Forms.Label();
this.OutputOffsetActiveYLabel = new System.Windows.Forms.Label(); this.OutputOffsetActiveYLabel = new System.Windows.Forms.Label();
this.AccelerationActiveLabelY = new System.Windows.Forms.Label(); this.AccelerationActiveLabelY = new System.Windows.Forms.Label();
this.MidpointActiveXLabel = new System.Windows.Forms.Label(); this.SyncSpeedActiveXLabel = new System.Windows.Forms.Label();
this.LimitActiveXLabel = new System.Windows.Forms.Label(); this.LimitActiveXLabel = new System.Windows.Forms.Label();
this.InputJumpActiveXLabel = new System.Windows.Forms.Label(); this.InputJumpActiveXLabel = new System.Windows.Forms.Label();
this.OutputJumpActiveXLabel = new System.Windows.Forms.Label(); this.OutputJumpActiveXLabel = new System.Windows.Forms.Label();
@ -245,7 +245,7 @@ namespace grapher
this.expBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.expBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.expBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.expBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.accelTypeDropY = new grapher.Models.Theming.Controls.ThemeableComboBox(); this.accelTypeDropY = new grapher.Models.Theming.Controls.ThemeableComboBox();
this.midpointBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.syncSpeedBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.limitBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.limitBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.inputJumpBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.inputJumpBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.outputJumpBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.outputJumpBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
@ -258,7 +258,7 @@ namespace grapher
this.outputJumpBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.outputJumpBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.inputOffsetBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.inputOffsetBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.outputOffsetBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.outputOffsetBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.midpointBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.syncSpeedBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.limitBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.limitBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.inCapBoxXClassic = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.inCapBoxXClassic = new grapher.Models.Theming.Controls.ThemeableTextBox();
this.accelerationBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox(); this.accelerationBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
@ -381,7 +381,7 @@ namespace grapher
this.optionsPanel.Controls.Add(this.inCapLabelYClassic); this.optionsPanel.Controls.Add(this.inCapLabelYClassic);
this.optionsPanel.Controls.Add(this.constantOneLabelY); this.optionsPanel.Controls.Add(this.constantOneLabelY);
this.optionsPanel.Controls.Add(this.ByComponentXYLock); this.optionsPanel.Controls.Add(this.ByComponentXYLock);
this.optionsPanel.Controls.Add(this.MidpointActiveYLabel); this.optionsPanel.Controls.Add(this.SyncSpeedActiveYLabel);
this.optionsPanel.Controls.Add(this.LimitActiveYLabel); this.optionsPanel.Controls.Add(this.LimitActiveYLabel);
this.optionsPanel.Controls.Add(this.InputJumpActiveYLabel); this.optionsPanel.Controls.Add(this.InputJumpActiveYLabel);
this.optionsPanel.Controls.Add(this.OutputJumpActiveYLabel); this.optionsPanel.Controls.Add(this.OutputJumpActiveYLabel);
@ -389,14 +389,14 @@ namespace grapher
this.optionsPanel.Controls.Add(this.OutputOffsetActiveYLabel); this.optionsPanel.Controls.Add(this.OutputOffsetActiveYLabel);
this.optionsPanel.Controls.Add(this.AccelerationActiveLabelY); this.optionsPanel.Controls.Add(this.AccelerationActiveLabelY);
this.optionsPanel.Controls.Add(this.accelTypeDropY); this.optionsPanel.Controls.Add(this.accelTypeDropY);
this.optionsPanel.Controls.Add(this.midpointBoxY); this.optionsPanel.Controls.Add(this.syncSpeedBoxY);
this.optionsPanel.Controls.Add(this.limitBoxY); this.optionsPanel.Controls.Add(this.limitBoxY);
this.optionsPanel.Controls.Add(this.inputJumpBoxY); this.optionsPanel.Controls.Add(this.inputJumpBoxY);
this.optionsPanel.Controls.Add(this.outputJumpBoxY); this.optionsPanel.Controls.Add(this.outputJumpBoxY);
this.optionsPanel.Controls.Add(this.inputOffsetBoxY); this.optionsPanel.Controls.Add(this.inputOffsetBoxY);
this.optionsPanel.Controls.Add(this.outputOffsetBoxY); this.optionsPanel.Controls.Add(this.outputOffsetBoxY);
this.optionsPanel.Controls.Add(this.accelerationBoxY); this.optionsPanel.Controls.Add(this.accelerationBoxY);
this.optionsPanel.Controls.Add(this.MidpointActiveXLabel); this.optionsPanel.Controls.Add(this.SyncSpeedActiveXLabel);
this.optionsPanel.Controls.Add(this.LimitActiveXLabel); this.optionsPanel.Controls.Add(this.LimitActiveXLabel);
this.optionsPanel.Controls.Add(this.InputJumpActiveXLabel); this.optionsPanel.Controls.Add(this.InputJumpActiveXLabel);
this.optionsPanel.Controls.Add(this.OutputJumpActiveXLabel); this.optionsPanel.Controls.Add(this.OutputJumpActiveXLabel);
@ -425,7 +425,7 @@ namespace grapher
this.optionsPanel.Controls.Add(this.inputOffsetBoxX); this.optionsPanel.Controls.Add(this.inputOffsetBoxX);
this.optionsPanel.Controls.Add(this.outputOffsetBoxX); this.optionsPanel.Controls.Add(this.outputOffsetBoxX);
this.optionsPanel.Controls.Add(this.constantThreeLabelX); this.optionsPanel.Controls.Add(this.constantThreeLabelX);
this.optionsPanel.Controls.Add(this.midpointBoxX); this.optionsPanel.Controls.Add(this.syncSpeedBoxX);
this.optionsPanel.Controls.Add(this.limitLabelX); this.optionsPanel.Controls.Add(this.limitLabelX);
this.optionsPanel.Controls.Add(this.limitBoxX); this.optionsPanel.Controls.Add(this.limitBoxX);
this.optionsPanel.Controls.Add(this.inCapLabelXClassic); this.optionsPanel.Controls.Add(this.inCapLabelXClassic);
@ -1202,7 +1202,7 @@ namespace grapher
this.constantThreeLabelY.Name = "constantThreeLabelY"; this.constantThreeLabelY.Name = "constantThreeLabelY";
this.constantThreeLabelY.Size = new System.Drawing.Size(47, 13); this.constantThreeLabelY.Size = new System.Drawing.Size(47, 13);
this.constantThreeLabelY.TabIndex = 137; this.constantThreeLabelY.TabIndex = 137;
this.constantThreeLabelY.Text = "Midpoint"; this.constantThreeLabelY.Text = "SyncSpeed";
// //
// limitLabelY // limitLabelY
// //
@ -1278,14 +1278,14 @@ namespace grapher
this.ByComponentXYLock.TabIndex = 20; this.ByComponentXYLock.TabIndex = 20;
this.ByComponentXYLock.UseVisualStyleBackColor = true; this.ByComponentXYLock.UseVisualStyleBackColor = true;
// //
// MidpointActiveYLabel // SyncSpeedActiveYLabel
// //
this.MidpointActiveYLabel.AutoSize = true; this.SyncSpeedActiveYLabel.AutoSize = true;
this.MidpointActiveYLabel.Location = new System.Drawing.Point(414, 330); this.SyncSpeedActiveYLabel.Location = new System.Drawing.Point(414, 330);
this.MidpointActiveYLabel.Name = "MidpointActiveYLabel"; this.SyncSpeedActiveYLabel.Name = "SyncSpeedActiveYLabel";
this.MidpointActiveYLabel.Size = new System.Drawing.Size(13, 13); this.SyncSpeedActiveYLabel.Size = new System.Drawing.Size(13, 13);
this.MidpointActiveYLabel.TabIndex = 131; this.SyncSpeedActiveYLabel.TabIndex = 131;
this.MidpointActiveYLabel.Text = "0"; this.SyncSpeedActiveYLabel.Text = "0";
// //
// LimitActiveYLabel // LimitActiveYLabel
// //
@ -1341,14 +1341,14 @@ namespace grapher
this.AccelerationActiveLabelY.TabIndex = 128; this.AccelerationActiveLabelY.TabIndex = 128;
this.AccelerationActiveLabelY.Text = "0"; this.AccelerationActiveLabelY.Text = "0";
// //
// MidpointActiveXLabel // SyncSpeedActiveXLabel
// //
this.MidpointActiveXLabel.AutoSize = true; this.SyncSpeedActiveXLabel.AutoSize = true;
this.MidpointActiveXLabel.Location = new System.Drawing.Point(197, 330); this.SyncSpeedActiveXLabel.Location = new System.Drawing.Point(197, 330);
this.MidpointActiveXLabel.Name = "MidpointActiveXLabel"; this.SyncSpeedActiveXLabel.Name = "SyncSpeedActiveXLabel";
this.MidpointActiveXLabel.Size = new System.Drawing.Size(13, 13); this.SyncSpeedActiveXLabel.Size = new System.Drawing.Size(13, 13);
this.MidpointActiveXLabel.TabIndex = 127; this.SyncSpeedActiveXLabel.TabIndex = 127;
this.MidpointActiveXLabel.Text = "0"; this.SyncSpeedActiveXLabel.Text = "0";
// //
// LimitActiveXLabel // LimitActiveXLabel
// //
@ -1553,7 +1553,7 @@ namespace grapher
this.constantThreeLabelX.Name = "constantThreeLabelX"; this.constantThreeLabelX.Name = "constantThreeLabelX";
this.constantThreeLabelX.Size = new System.Drawing.Size(47, 13); this.constantThreeLabelX.Size = new System.Drawing.Size(47, 13);
this.constantThreeLabelX.TabIndex = 105; this.constantThreeLabelX.TabIndex = 105;
this.constantThreeLabelX.Text = "Midpoint"; this.constantThreeLabelX.Text = "SyncSpeed";
this.constantThreeLabelX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.constantThreeLabelX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// limitLabelX // limitLabelX
@ -2216,12 +2216,12 @@ namespace grapher
this.accelTypeDropY.TabIndex = 140; this.accelTypeDropY.TabIndex = 140;
this.accelTypeDropY.Text = "Accel Type"; this.accelTypeDropY.Text = "Accel Type";
// //
// midpointBoxY // syncSpeedBoxY
// //
this.midpointBoxY.Location = new System.Drawing.Point(332, 327); this.syncSpeedBoxY.Location = new System.Drawing.Point(332, 327);
this.midpointBoxY.Name = "midpointBoxY"; this.syncSpeedBoxY.Name = "syncSpeedBoxY";
this.midpointBoxY.Size = new System.Drawing.Size(76, 20); this.syncSpeedBoxY.Size = new System.Drawing.Size(76, 20);
this.midpointBoxY.TabIndex = 214; this.syncSpeedBoxY.TabIndex = 214;
// //
// limitBoxY // limitBoxY
// //
@ -2307,12 +2307,12 @@ namespace grapher
this.outputOffsetBoxX.Size = new System.Drawing.Size(76, 20); this.outputOffsetBoxX.Size = new System.Drawing.Size(76, 20);
this.outputOffsetBoxX.TabIndex = 113; this.outputOffsetBoxX.TabIndex = 113;
// //
// midpointBoxX // syncSpeedBoxX
// //
this.midpointBoxX.Location = new System.Drawing.Point(106, 327); this.syncSpeedBoxX.Location = new System.Drawing.Point(106, 327);
this.midpointBoxX.Name = "midpointBoxX"; this.syncSpeedBoxX.Name = "syncSpeedBoxX";
this.midpointBoxX.Size = new System.Drawing.Size(76, 20); this.syncSpeedBoxX.Size = new System.Drawing.Size(76, 20);
this.midpointBoxX.TabIndex = 114; this.syncSpeedBoxX.TabIndex = 114;
// //
// limitBoxX // limitBoxX
// //
@ -2417,7 +2417,7 @@ namespace grapher
private System.Windows.Forms.Label inCapLabelYClassic; private System.Windows.Forms.Label inCapLabelYClassic;
private System.Windows.Forms.Label constantOneLabelY; private System.Windows.Forms.Label constantOneLabelY;
private System.Windows.Forms.CheckBox ByComponentXYLock; private System.Windows.Forms.CheckBox ByComponentXYLock;
private System.Windows.Forms.Label MidpointActiveYLabel; private System.Windows.Forms.Label SyncSpeedActiveYLabel;
private System.Windows.Forms.Label LimitActiveYLabel; private System.Windows.Forms.Label LimitActiveYLabel;
private System.Windows.Forms.Label InputJumpActiveYLabel; private System.Windows.Forms.Label InputJumpActiveYLabel;
private System.Windows.Forms.Label OutputJumpActiveYLabel; private System.Windows.Forms.Label OutputJumpActiveYLabel;
@ -2425,14 +2425,14 @@ namespace grapher
private System.Windows.Forms.Label OutputOffsetActiveYLabel; private System.Windows.Forms.Label OutputOffsetActiveYLabel;
private System.Windows.Forms.Label AccelerationActiveLabelY; private System.Windows.Forms.Label AccelerationActiveLabelY;
private grapher.Models.Theming.Controls.ThemeableComboBox accelTypeDropY; private grapher.Models.Theming.Controls.ThemeableComboBox accelTypeDropY;
private grapher.Models.Theming.Controls.ThemeableTextBox midpointBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox syncSpeedBoxY;
private grapher.Models.Theming.Controls.ThemeableTextBox limitBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox limitBoxY;
private grapher.Models.Theming.Controls.ThemeableTextBox inputJumpBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox inputJumpBoxY;
private grapher.Models.Theming.Controls.ThemeableTextBox outputJumpBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox outputJumpBoxY;
private grapher.Models.Theming.Controls.ThemeableTextBox inputOffsetBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox inputOffsetBoxY;
private grapher.Models.Theming.Controls.ThemeableTextBox outputOffsetBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox outputOffsetBoxY;
private grapher.Models.Theming.Controls.ThemeableTextBox accelerationBoxY; private grapher.Models.Theming.Controls.ThemeableTextBox accelerationBoxY;
private System.Windows.Forms.Label MidpointActiveXLabel; private System.Windows.Forms.Label SyncSpeedActiveXLabel;
private System.Windows.Forms.Label LimitActiveXLabel; private System.Windows.Forms.Label LimitActiveXLabel;
private System.Windows.Forms.Label InputJumpActiveXLabel; private System.Windows.Forms.Label InputJumpActiveXLabel;
private System.Windows.Forms.Label OutputJumpActiveXLabel; private System.Windows.Forms.Label OutputJumpActiveXLabel;
@ -2461,7 +2461,7 @@ namespace grapher
private grapher.Models.Theming.Controls.ThemeableTextBox inputJumpBoxX; private grapher.Models.Theming.Controls.ThemeableTextBox inputJumpBoxX;
private grapher.Models.Theming.Controls.ThemeableTextBox outputJumpBoxX; private grapher.Models.Theming.Controls.ThemeableTextBox outputJumpBoxX;
private System.Windows.Forms.Label constantThreeLabelX; private System.Windows.Forms.Label constantThreeLabelX;
private grapher.Models.Theming.Controls.ThemeableTextBox midpointBoxX; private grapher.Models.Theming.Controls.ThemeableTextBox syncSpeedBoxX;
private System.Windows.Forms.Label limitLabelX; private System.Windows.Forms.Label limitLabelX;
private grapher.Models.Theming.Controls.ThemeableTextBox limitBoxX; private grapher.Models.Theming.Controls.ThemeableTextBox limitBoxX;
private System.Windows.Forms.Label inCapLabelXClassic; private System.Windows.Forms.Label inCapLabelXClassic;

8
grapher/Form1.cs
View file

@ -129,8 +129,8 @@ namespace grapher
powerBoxY, powerBoxY,
expBoxX, expBoxX,
expBoxY, expBoxY,
midpointBoxX, syncSpeedBoxX,
midpointBoxY, syncSpeedBoxY,
DomainBoxX, DomainBoxX,
DomainBoxY, DomainBoxY,
RangeBoxX, RangeBoxX,
@ -232,8 +232,8 @@ namespace grapher
PowerClassicActiveYLabel, PowerClassicActiveYLabel,
ExpActiveXLabel, ExpActiveXLabel,
ExpActiveYLabel, ExpActiveYLabel,
MidpointActiveXLabel, SyncSpeedActiveXLabel,
MidpointActiveYLabel, SyncSpeedActiveYLabel,
AccelTypeActiveLabelX, AccelTypeActiveLabelX,
AccelTypeActiveLabelY, AccelTypeActiveLabelY,
gainSwitchActiveLabelX, gainSwitchActiveLabelX,

4
grapher/Layouts/ClassicLayout.cs
View file

@ -14,14 +14,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(true, CapType); ClassicCapLayout = new OptionLayout(true, CapType);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(true, InputOffset); InputOffsetLayout = new OptionLayout(true, InputOffset);
LimitLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty);
PowerClassicLayout = new OptionLayout(true, PowerClassic); PowerClassicLayout = new OptionLayout(true, PowerClassic);
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/DefaultLayout.cs
View file

@ -15,14 +15,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(true, DecayRate); DecayRateLayout = new OptionLayout(true, DecayRate);
GrowthRateLayout = new OptionLayout(true, GrowthRate); GammaLayout = new OptionLayout(true, Gamma);
SmoothLayout = new OptionLayout(true, Smooth); SmoothLayout = new OptionLayout(true, Smooth);
InputOffsetLayout = new OptionLayout(true, InputOffset); InputOffsetLayout = new OptionLayout(true, InputOffset);
LimitLayout = new OptionLayout(true, Limit); LimitLayout = new OptionLayout(true, Limit);
PowerClassicLayout = new OptionLayout(true, PowerClassic); PowerClassicLayout = new OptionLayout(true, PowerClassic);
ExponentLayout = new OptionLayout(true, Exponent); ExponentLayout = new OptionLayout(true, Exponent);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(true, Midpoint); SyncSpeedLayout = new OptionLayout(true, SyncSpeed);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/JumpLayout.cs
View file

@ -15,14 +15,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(true, Smooth); SmoothLayout = new OptionLayout(true, Smooth);
InputOffsetLayout = new OptionLayout(false, InputOffset); InputOffsetLayout = new OptionLayout(false, InputOffset);
LimitLayout = new OptionLayout(false, Limit); LimitLayout = new OptionLayout(false, Limit);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/LUTLayout.cs
View file

@ -23,14 +23,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(false, string.Empty); InputOffsetLayout = new OptionLayout(false, string.Empty);
LimitLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, Exponent); ExponentLayout = new OptionLayout(false, Exponent);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(true, string.Empty); LutTextLayout = new OptionLayout(true, string.Empty);
LutPanelLayout = new OptionLayout(true, string.Empty); LutPanelLayout = new OptionLayout(true, string.Empty);
LutApplyOptionsLayout = new OptionLayout(true, string.Empty); LutApplyOptionsLayout = new OptionLayout(true, string.Empty);

22
grapher/Layouts/LayoutBase.cs
View file

@ -5,14 +5,14 @@ namespace grapher.Layouts
public abstract class LayoutBase public abstract class LayoutBase
{ {
public const string Acceleration = "Acceleration"; public const string Acceleration = "Acceleration";
public const string GrowthRate = "Growth Rate"; public const string Gamma = "Gamma";
public const string DecayRate = "Decay Rate"; public const string DecayRate = "Decay Rate";
public const string Scale = "Scale"; public const string Scale = "Scale";
public const string Exponent = "Exponent"; public const string Exponent = "Exponent";
public const string OutputOffset = "Output Offset"; public const string OutputOffset = "Output Offset";
public const string PowerClassic = "Power"; public const string PowerClassic = "Power";
public const string Limit = "Limit"; public const string Limit = "Limit";
public const string Midpoint = "Midpoint"; public const string SyncSpeed = "SyncSpeed";
public const string Motivity = "Motivity"; public const string Motivity = "Motivity";
public const string InputOffset = "Input Offset"; public const string InputOffset = "Input Offset";
public const string CapType = "Cap Type"; public const string CapType = "Cap Type";
@ -25,7 +25,7 @@ namespace grapher.Layouts
public LayoutBase() public LayoutBase()
{ {
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
@ -36,7 +36,7 @@ namespace grapher.Layouts
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
OutputJumpLayout = new OptionLayout(false, string.Empty); OutputJumpLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
@ -55,7 +55,7 @@ namespace grapher.Layouts
protected OptionLayout DecayRateLayout { get; set; } protected OptionLayout DecayRateLayout { get; set; }
protected OptionLayout GrowthRateLayout { get; set; } protected OptionLayout GammaLayout { get; set; }
protected OptionLayout SmoothLayout { get; set; } protected OptionLayout SmoothLayout { get; set; }
@ -77,7 +77,7 @@ namespace grapher.Layouts
protected OptionLayout OutputOffsetLayout { get; set; } protected OptionLayout OutputOffsetLayout { get; set; }
protected OptionLayout MidpointLayout { get; set; } protected OptionLayout SyncSpeedLayout { get; set; }
protected OptionLayout LutTextLayout { get; set; } protected OptionLayout LutTextLayout { get; set; }
@ -106,7 +106,7 @@ namespace grapher.Layouts
IOption expOption, IOption expOption,
IOption outputJumpOption, IOption outputJumpOption,
IOption outputOffsetOption, IOption outputOffsetOption,
IOption midpointOption, IOption syncSpeedOption,
IOption lutTextOption, IOption lutTextOption,
IOption lutPanelOption, IOption lutPanelOption,
IOption lutApplyOption, IOption lutApplyOption,
@ -120,7 +120,7 @@ namespace grapher.Layouts
(ClassicCapLayout, classicCapOption), (ClassicCapLayout, classicCapOption),
(PowerCapLayout, powerCapOption), (PowerCapLayout, powerCapOption),
(DecayRateLayout, decayRateOption), (DecayRateLayout, decayRateOption),
(GrowthRateLayout, growthRateOption), (GammaLayout, growthRateOption),
(SmoothLayout, smoothOption), (SmoothLayout, smoothOption),
(InputJumpLayout, inputJumpOption), (InputJumpLayout, inputJumpOption),
(InputOffsetLayout, inputOffsetOption), (InputOffsetLayout, inputOffsetOption),
@ -129,7 +129,7 @@ namespace grapher.Layouts
(ExponentLayout, expOption), (ExponentLayout, expOption),
(OutputJumpLayout, outputJumpOption), (OutputJumpLayout, outputJumpOption),
(OutputOffsetLayout, outputOffsetOption), (OutputOffsetLayout, outputOffsetOption),
(MidpointLayout, midpointOption), (SyncSpeedLayout, syncSpeedOption),
(LutTextLayout, lutTextOption), (LutTextLayout, lutTextOption),
(LutPanelLayout, lutPanelOption), (LutPanelLayout, lutPanelOption),
(LutApplyOptionsLayout, lutApplyOption)}) (LutApplyOptionsLayout, lutApplyOption)})
@ -166,7 +166,7 @@ namespace grapher.Layouts
IOption expOption, IOption expOption,
IOption outputJumpOption, IOption outputJumpOption,
IOption outputOffsetOption, IOption outputOffsetOption,
IOption midpointOption, IOption syncSpeedOption,
IOption lutTextOption, IOption lutTextOption,
IOption lutPanelOption, IOption lutPanelOption,
IOption lutApplyOption) IOption lutApplyOption)
@ -184,7 +184,7 @@ namespace grapher.Layouts
expOption, expOption,
outputJumpOption, outputJumpOption,
outputOffsetOption, outputOffsetOption,
midpointOption, syncSpeedOption,
lutTextOption, lutTextOption,
lutPanelOption, lutPanelOption,
lutApplyOption, lutApplyOption,

4
grapher/Layouts/LinearLayout.cs
View file

@ -16,14 +16,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(true, CapType); ClassicCapLayout = new OptionLayout(true, CapType);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(true, InputOffset); InputOffsetLayout = new OptionLayout(true, InputOffset);
LimitLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/NaturalLayout.cs
View file

@ -15,14 +15,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(true, DecayRate); DecayRateLayout = new OptionLayout(true, DecayRate);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(true, InputOffset); InputOffsetLayout = new OptionLayout(true, InputOffset);
LimitLayout = new OptionLayout(true, Limit); LimitLayout = new OptionLayout(true, Limit);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/OffLayout.cs
View file

@ -15,14 +15,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(false, string.Empty); InputOffsetLayout = new OptionLayout(false, string.Empty);
LimitLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/PowerLayout.cs
View file

@ -13,14 +13,14 @@
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(true, CapType); PowerCapLayout = new OptionLayout(true, CapType);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(false, string.Empty); InputOffsetLayout = new OptionLayout(false, string.Empty);
LimitLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(true, Exponent); ExponentLayout = new OptionLayout(true, Exponent);
OutputOffsetLayout = new OptionLayout(true, OutputOffset); OutputOffsetLayout = new OptionLayout(true, OutputOffset);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

12
grapher/Layouts/MotivityLayout.cs → grapher/Layouts/SynchronousLayout.cs
View file

@ -7,27 +7,27 @@ using System.Threading.Tasks;
namespace grapher.Layouts namespace grapher.Layouts
{ {
public class MotivityLayout : LayoutBase public class SynchronousLayout : LayoutBase
{ {
public MotivityLayout() public SynchronousLayout()
: base() : base()
{ {
Name = "Motivity"; Name = "Synchronous";
Mode = AccelMode.motivity; Mode = AccelMode.synchronous;
LogarithmicCharts = true; LogarithmicCharts = true;
GainSwitchOptionLayout = new OptionLayout(true, Gain); GainSwitchOptionLayout = new OptionLayout(true, Gain);
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(true, GrowthRate); GammaLayout = new OptionLayout(true, Gamma);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(false, string.Empty); InputOffsetLayout = new OptionLayout(false, string.Empty);
LimitLayout = new OptionLayout(true, Motivity); LimitLayout = new OptionLayout(true, Motivity);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, string.Empty);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(true, Midpoint); SyncSpeedLayout = new OptionLayout(true, SyncSpeed);
LutTextLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(false, string.Empty);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

4
grapher/Layouts/UnsupportedLayout.cs
View file

@ -20,14 +20,14 @@ namespace grapher.Layouts
ClassicCapLayout = new OptionLayout(false, string.Empty); ClassicCapLayout = new OptionLayout(false, string.Empty);
PowerCapLayout = new OptionLayout(false, string.Empty); PowerCapLayout = new OptionLayout(false, string.Empty);
DecayRateLayout = new OptionLayout(false, string.Empty); DecayRateLayout = new OptionLayout(false, string.Empty);
GrowthRateLayout = new OptionLayout(false, string.Empty); GammaLayout = new OptionLayout(false, string.Empty);
SmoothLayout = new OptionLayout(false, string.Empty); SmoothLayout = new OptionLayout(false, string.Empty);
InputOffsetLayout = new OptionLayout(false, string.Empty); InputOffsetLayout = new OptionLayout(false, string.Empty);
LimitLayout = new OptionLayout(false, string.Empty); LimitLayout = new OptionLayout(false, string.Empty);
PowerClassicLayout = new OptionLayout(false, string.Empty); PowerClassicLayout = new OptionLayout(false, string.Empty);
ExponentLayout = new OptionLayout(false, Exponent); ExponentLayout = new OptionLayout(false, Exponent);
OutputOffsetLayout = new OptionLayout(false, string.Empty); OutputOffsetLayout = new OptionLayout(false, string.Empty);
MidpointLayout = new OptionLayout(false, string.Empty); SyncSpeedLayout = new OptionLayout(false, string.Empty);
LutTextLayout = new OptionLayout(true, LUTLayoutText); LutTextLayout = new OptionLayout(true, LUTLayoutText);
LutPanelLayout = new OptionLayout(false, string.Empty); LutPanelLayout = new OptionLayout(false, string.Empty);
LutApplyOptionsLayout = new OptionLayout(false, string.Empty); LutApplyOptionsLayout = new OptionLayout(false, string.Empty);

24
grapher/Models/AccelGUIFactory.cs
View file

@ -81,8 +81,8 @@ namespace grapher.Models
ThemeableTextBox powerClassicBoxY, ThemeableTextBox powerClassicBoxY,
ThemeableTextBox expBoxX, ThemeableTextBox expBoxX,
ThemeableTextBox expBoxY, ThemeableTextBox expBoxY,
ThemeableTextBox midpointBoxX, ThemeableTextBox syncSpeedBoxX,
ThemeableTextBox midpointBoxY, ThemeableTextBox syncSpeedBoxY,
ThemeableTextBox domainBoxX, ThemeableTextBox domainBoxX,
ThemeableTextBox domainBoxY, ThemeableTextBox domainBoxY,
ThemeableTextBox rangeBoxX, ThemeableTextBox rangeBoxX,
@ -184,8 +184,8 @@ namespace grapher.Models
Label powerClassicActiveLabelY, Label powerClassicActiveLabelY,
Label expActiveLabelX, Label expActiveLabelX,
Label expActiveLabelY, Label expActiveLabelY,
Label midpointActiveLabelX, Label syncSpeedActiveLabelX,
Label midpointActiveLabelY, Label syncSpeedActiveLabelY,
Label accelTypeActiveLabelX, Label accelTypeActiveLabelX,
Label accelTypeActiveLabelY, Label accelTypeActiveLabelY,
Label gainSwitchActiveLabelX, Label gainSwitchActiveLabelX,
@ -430,16 +430,16 @@ namespace grapher.Models
new ActiveValueLabel(expActiveLabelY, activeValueTitleY), new ActiveValueLabel(expActiveLabelY, activeValueTitleY),
optionSetYLeft); optionSetYLeft);
var midpointX = new Option( var syncSpeedX = new Option(
new Field(midpointBoxX, form, 0), new Field(syncSpeedBoxX, form, 0),
constantThreeLabelX, constantThreeLabelX,
new ActiveValueLabel(midpointActiveLabelX, activeValueTitleX), new ActiveValueLabel(syncSpeedActiveLabelX, activeValueTitleX),
0); 0);
var midpointY = new Option( var syncSpeedY = new Option(
new Field(midpointBoxY, form, 0), new Field(syncSpeedBoxY, form, 0),
constantThreeLabelY, constantThreeLabelY,
new ActiveValueLabel(midpointActiveLabelY, activeValueTitleY), new ActiveValueLabel(syncSpeedActiveLabelY, activeValueTitleY),
optionSetYLeft); optionSetYLeft);
var inCapXClassic = new Option( var inCapXClassic = new Option(
@ -621,7 +621,7 @@ namespace grapher.Models
limitX, limitX,
powerClassicX, powerClassicX,
exponentX, exponentX,
midpointX, syncSpeedX,
lutTextX, lutTextX,
new LUTPanelOptions(xLutPointsBox, xLutActiveValuesBox), new LUTPanelOptions(xLutPointsBox, xLutActiveValuesBox),
new LutApplyOptions( new LutApplyOptions(
@ -646,7 +646,7 @@ namespace grapher.Models
limitY, limitY,
powerClassicY, powerClassicY,
exponentY, exponentY,
midpointY, syncSpeedY,
lutTextY, lutTextY,
new LUTPanelOptions(yLutPointsBox, yLutActiveValuesBox), new LUTPanelOptions(yLutPointsBox, yLutActiveValuesBox),
new LutApplyOptions( new LutApplyOptions(

26
grapher/Models/Options/AccelTypeOptions.cs
View file

@ -16,7 +16,7 @@ namespace grapher
public static readonly LayoutBase Classic = new ClassicLayout(); public static readonly LayoutBase Classic = new ClassicLayout();
public static readonly LayoutBase Jump = new JumpLayout(); public static readonly LayoutBase Jump = new JumpLayout();
public static readonly LayoutBase Natural = new NaturalLayout(); public static readonly LayoutBase Natural = new NaturalLayout();
public static readonly LayoutBase Motivity = new MotivityLayout(); public static readonly LayoutBase Synchronous = new SynchronousLayout();
public static readonly LayoutBase Power = new PowerLayout(); public static readonly LayoutBase Power = new PowerLayout();
public static readonly LayoutBase LUT = new LUTLayout(); public static readonly LayoutBase LUT = new LUTLayout();
public static readonly LayoutBase Off = new OffLayout(); public static readonly LayoutBase Off = new OffLayout();
@ -40,7 +40,7 @@ namespace grapher
Option limit, Option limit,
Option powerClassic, Option powerClassic,
Option exponent, Option exponent,
Option midpoint, Option syncSpeed,
TextOption lutText, TextOption lutText,
LUTPanelOptions lutPanelOptions, LUTPanelOptions lutPanelOptions,
LutApplyOptions lutApplyOptions, LutApplyOptions lutApplyOptions,
@ -56,7 +56,7 @@ namespace grapher
Classic, Classic,
Jump, Jump,
Natural, Natural,
Motivity, Synchronous,
Power, Power,
LUT, LUT,
Off Off
@ -77,7 +77,7 @@ namespace grapher
Exponent = exponent; Exponent = exponent;
OutputJump = outputJump; OutputJump = outputJump;
OutputOffset = outputOffset; OutputOffset = outputOffset;
Midpoint = midpoint; SyncSpeed = syncSpeed;
WriteButton = writeButton; WriteButton = writeButton;
AccelTypeActiveValue = accelTypeActiveValue; AccelTypeActiveValue = accelTypeActiveValue;
LutText = lutText; LutText = lutText;
@ -137,7 +137,7 @@ namespace grapher
public Option Exponent { get; } public Option Exponent { get; }
public Option Midpoint { get; } public Option SyncSpeed { get; }
public TextOption LutText { get; } public TextOption LutText { get; }
@ -243,7 +243,7 @@ namespace grapher
Limit.Hide(); Limit.Hide();
PowerClassic.Hide(); PowerClassic.Hide();
Exponent.Hide(); Exponent.Hide();
Midpoint.Hide(); SyncSpeed.Hide();
LutText.Hide(); LutText.Hide();
LutPanel.Hide(); LutPanel.Hide();
LutApply.Hide(); LutApply.Hide();
@ -283,10 +283,10 @@ namespace grapher
DecayRate.SetActiveValue(args.decayRate); DecayRate.SetActiveValue(args.decayRate);
GrowthRate.SetActiveValue(args.gamma); GrowthRate.SetActiveValue(args.gamma);
Smooth.SetActiveValue(args.smooth); Smooth.SetActiveValue(args.smooth);
Limit.SetActiveValue((args.mode == AccelMode.motivity) ? args.motivity : args.limit); Limit.SetActiveValue((args.mode == AccelMode.synchronous) ? args.motivity : args.limit);
PowerClassic.SetActiveValue(args.exponentClassic); PowerClassic.SetActiveValue(args.exponentClassic);
Exponent.SetActiveValue(args.exponentPower); Exponent.SetActiveValue(args.exponentPower);
Midpoint.SetActiveValue(args.syncSpeed); SyncSpeed.SetActiveValue(args.syncSpeed);
LutPanel.SetActiveValues(args.data, args.length, args.mode); LutPanel.SetActiveValues(args.data, args.length, args.mode);
LutApply.SetActiveValue(args.gain); LutApply.SetActiveValue(args.gain);
} }
@ -346,7 +346,7 @@ namespace grapher
if (OutputJump.Visible) args.cap.y = OutputJump.Field.Data; if (OutputJump.Visible) args.cap.y = OutputJump.Field.Data;
if (Limit.Visible) if (Limit.Visible)
{ {
if (args.mode == AccelMode.motivity) if (args.mode == AccelMode.synchronous)
{ {
args.motivity = Limit.Field.Data; args.motivity = Limit.Field.Data;
} }
@ -360,7 +360,7 @@ namespace grapher
if (InputOffset.Visible) args.inputOffset = InputOffset.Field.Data; if (InputOffset.Visible) args.inputOffset = InputOffset.Field.Data;
if (OutputOffset.Visible) args.outputOffset = OutputOffset.Field.Data; if (OutputOffset.Visible) args.outputOffset = OutputOffset.Field.Data;
if (Midpoint.Visible) args.syncSpeed = Midpoint.Field.Data; if (SyncSpeed.Visible) args.syncSpeed = SyncSpeed.Field.Data;
if (LutPanel.Visible) if (LutPanel.Visible)
{ {
(var points, var length) = LutPanel.GetPoints(); (var points, var length) = LutPanel.GetPoints();
@ -393,7 +393,7 @@ namespace grapher
Limit.AlignActiveValues(); Limit.AlignActiveValues();
PowerClassic.AlignActiveValues(); PowerClassic.AlignActiveValues();
Exponent.AlignActiveValues(); Exponent.AlignActiveValues();
Midpoint.AlignActiveValues(); SyncSpeed.AlignActiveValues();
LutApply.AlignActiveValues(); LutApply.AlignActiveValues();
} }
@ -433,7 +433,7 @@ namespace grapher
Exponent, Exponent,
OutputJump, OutputJump,
OutputOffset, OutputOffset,
Midpoint, SyncSpeed,
LutText, LutText,
LutPanel, LutPanel,
LutApply, LutApply,
@ -447,7 +447,7 @@ namespace grapher
case AccelMode.classic: return (args.exponentClassic == 2) ? Linear : Classic; case AccelMode.classic: return (args.exponentClassic == 2) ? Linear : Classic;
case AccelMode.jump: return Jump; case AccelMode.jump: return Jump;
case AccelMode.natural: return Natural; case AccelMode.natural: return Natural;
case AccelMode.motivity: return Motivity; case AccelMode.synchronous: return Synchronous;
case AccelMode.power: return Power; case AccelMode.power: return Power;
case AccelMode.lut: return LUT; case AccelMode.lut: return LUT;
default: return Off; default: return Off;

4
grapher/grapher.csproj
View file

@ -78,12 +78,12 @@
<DependentUpon>AboutBox.cs</DependentUpon> <DependentUpon>AboutBox.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Common\Constants.cs" /> <Compile Include="Common\Constants.cs" />
<Compile Include="Common\Helper.cs" /> <Compile Include="Common\Helper.cs" />
<Compile Include="DeviceMenuForm.cs"> <Compile Include="DeviceMenuForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Layouts\LUTLayout.cs" /> <Compile Include="Layouts\LUTLayout.cs" />
<Compile Include="Layouts\MotivityLayout.cs" /> <Compile Include="Layouts\SynchronousLayout.cs" />
<Compile Include="Layouts\JumpLayout.cs" /> <Compile Include="Layouts\JumpLayout.cs" />
<Compile Include="Layouts\UnsupportedLayout.cs" /> <Compile Include="Layouts\UnsupportedLayout.cs" />
<Compile Include="MessageDialog.cs"> <Compile Include="MessageDialog.cs">

2
wrapper-tests/SynchronousAccelTests.cs
View file

@ -17,7 +17,7 @@ namespace wrapper_tests
var profile = new Profile(); var profile = new Profile();
profile.outputDPI = 1000; profile.outputDPI = 1000;
profile.argsX.mode = AccelMode.motivity; profile.argsX.mode = AccelMode.synchronous;
profile.argsX.gain = false; profile.argsX.gain = false;
profile.argsX.syncSpeed = syncSpeed; profile.argsX.syncSpeed = syncSpeed;
profile.argsX.gamma = gamma; profile.argsX.gamma = gamma;

2
wrapper/wrapper.cpp
View file

@ -37,7 +37,7 @@ public ref struct VersionHelper
[JsonConverter(Converters::StringEnumConverter::typeid)] [JsonConverter(Converters::StringEnumConverter::typeid)]
public enum class AccelMode public enum class AccelMode
{ {
classic, jump, natural, motivity, power, lut, noaccel classic, jump, natural, synchronous, power, lut, noaccel
}; };
[JsonConverter(Converters::StringEnumConverter::typeid)] [JsonConverter(Converters::StringEnumConverter::typeid)]