From d868fe150fde91927c96deaed663acbf165b39f1 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Mon, 28 Sep 2020 02:26:29 -0400
Subject: update build config
---
grapher/grapher.csproj | 38 ++++++++++++++++++++++++++++++++++++++
grapher/mouse.ico | Bin 0 -> 112630 bytes
2 files changed, 38 insertions(+)
create mode 100644 grapher/mouse.ico
(limited to 'grapher')
diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj
index 9e9b15b..3e23226 100644
--- a/grapher/grapher.csproj
+++ b/grapher/grapher.csproj
@@ -12,6 +12,21 @@
512
true
true
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
true
@@ -35,6 +50,9 @@
MinimumRecommendedRules.ruleset
true
+
+ mouse.ico
+
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -140,5 +158,25 @@
+
+
+ False
+ Microsoft .NET Framework 4.7.2 %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+
+
+
+
+ IF ($(ConfigurationName)) == (Debug) GOTO END
+copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)"
+:END
+
\ No newline at end of file
diff --git a/grapher/mouse.ico b/grapher/mouse.ico
new file mode 100644
index 0000000..493036a
Binary files /dev/null and b/grapher/mouse.ico differ
--
cgit v1.2.3
From 9bb5616061d823fa3632b0d99ba177ac2de74ade Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Tue, 29 Sep 2020 07:43:50 -0400
Subject: set invisible args to default values before write
---
grapher/Models/AccelGUI.cs | 2 +-
grapher/Models/Options/AccelOptionSet.cs | 8 ++++----
grapher/Models/Options/AccelTypeOptions.cs | 25 +++++++++++++------------
grapher/Models/Options/ApplyOptions.cs | 6 +++---
4 files changed, 21 insertions(+), 20 deletions(-)
(limited to 'grapher')
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 15a0c0e..11685ee 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -84,7 +84,7 @@ namespace grapher
},
combineMagnitudes = ApplyOptions.IsWhole,
modes = ApplyOptions.GetModes(),
- args = ApplyOptions.GetUpdatedArgs(ref driverSettings.args),
+ args = ApplyOptions.GetArgs(),
minimumTime = driverSettings.minimumTime
};
diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs
index 53c39af..11a7f10 100644
--- a/grapher/Models/Options/AccelOptionSet.cs
+++ b/grapher/Models/Options/AccelOptionSet.cs
@@ -98,14 +98,14 @@ namespace grapher.Models.Options
Options.Top = TopAnchor;
}
- public void SetArgs(ref AccelArgs args, ref /*readonly*/ AccelArgs last)
+ public void SetArgs(ref AccelArgs args)
{
- Options.SetArgs(ref args, ref last);
+ Options.SetArgs(ref args);
}
- public AccelArgs GenerateArgs(ref /*readonly*/ AccelArgs last)
+ public AccelArgs GenerateArgs()
{
- return Options.GenerateArgs(ref last);
+ return Options.GenerateArgs();
}
public void SetActiveValues(int mode, AccelArgs args)
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 9a4ab7c..f9ecac1 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -225,24 +225,25 @@ namespace grapher
Width = Acceleration.Field.Width;
}
- public void SetArgs(ref AccelArgs args, ref /*readonly*/ AccelArgs last)
+ public void SetArgs(ref AccelArgs args)
{
- args.acceleration = Acceleration.Visible ? Acceleration.Field.Data : last.acceleration;
- args.scale = Scale.Visible ? Scale.Field.Data : last.scale;
- args.gainCap = Cap.VelocityGainCap;
- args.scaleCap = Cap.SensitivityCap;
- args.limit = Limit.Visible ? Limit.Field.Data : last.limit;
- args.exponent = Exponent.Visible ? Exponent.Field.Data : last.exponent;
- args.offset = Offset.Offset;
+ AccelArgs defaults = (AccelArgs)DriverInterop.DefaultArgs;
+ args.acceleration = Acceleration.Visible ? Acceleration.Field.Data : defaults.acceleration;
+ args.scale = Scale.Visible ? Scale.Field.Data : defaults.scale;
+ args.gainCap = Cap.Visible ? Cap.VelocityGainCap : defaults.gainCap;
+ args.scaleCap = Cap.Visible ? Cap.SensitivityCap : defaults.scaleCap;
+ args.limit = Limit.Visible ? Limit.Field.Data : defaults.limit;
+ args.exponent = Exponent.Visible ? Exponent.Field.Data : defaults.exponent;
+ args.offset = Offset.Visible ? Offset.Offset : defaults.offset;
args.legacyOffset = Offset.IsLegacy;
- args.midpoint = Midpoint.Visible ? Midpoint.Field.Data : last.midpoint;
- args.weight = Weight.Visible ? Weight.Field.Data : last.weight;
+ args.midpoint = Midpoint.Visible ? Midpoint.Field.Data : defaults.midpoint;
+ args.weight = Weight.Visible ? Weight.Field.Data : defaults.weight;
}
- public AccelArgs GenerateArgs(ref /*readonly*/ AccelArgs last)
+ public AccelArgs GenerateArgs()
{
AccelArgs args = new AccelArgs();
- SetArgs(ref args, ref last);
+ SetArgs(ref args);
return args;
}
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 51c80ea..c2ed498 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -89,14 +89,14 @@ namespace grapher.Models.Options
};
}
- public Vec2 GetUpdatedArgs(ref /*readonly*/ Vec2 last)
+ public Vec2 GetArgs()
{
- var xArgs = OptionSetX.GenerateArgs(ref last.x);
+ var xArgs = OptionSetX.GenerateArgs();
return new Vec2
{
x = xArgs,
- y = ByComponentVectorXYLock.Checked ? xArgs : OptionSetY.GenerateArgs(ref last.y)
+ y = ByComponentVectorXYLock.Checked ? xArgs : OptionSetY.GenerateArgs()
};
}
--
cgit v1.2.3