diff options
| author | a1xd <[email protected]> | 2020-10-08 23:12:08 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-08 23:12:08 -0400 |
| commit | f4c04b4eb03fdbf1f3402dfb26e891ce8d968c9f (patch) | |
| tree | 2da2e0e956c8b92c24260ec9ed4fa3f0681c0a1a /grapher/Models/Options | |
| parent | Fixed anisotropy not loading correctly on save (diff) | |
| parent | add magic number to constants (diff) | |
| download | rawaccel-1.1.0.tar.xz rawaccel-1.1.0.zip | |
Merge pull request #33 from a1xd/1.1v1.1.0
1.1
Diffstat (limited to 'grapher/Models/Options')
| -rw-r--r-- | grapher/Models/Options/AccelTypeOptions.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Options/ApplyOptions.cs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index f9ecac1..4410a12 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -227,7 +227,7 @@ namespace grapher public void SetArgs(ref AccelArgs args) { - AccelArgs defaults = (AccelArgs)DriverInterop.DefaultArgs; + AccelArgs defaults = DriverInterop.DefaultSettings.args.x; 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; diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs index 71e580d..b8cc9bf 100644 --- a/grapher/Models/Options/ApplyOptions.cs +++ b/grapher/Models/Options/ApplyOptions.cs @@ -175,16 +175,14 @@ namespace grapher.Models.Options { OptionSetX.SetRegularMode(); OptionSetY.Hide(); - AccelCharts.SetWidened(); - SetActiveTitlesWhole(); + //SetActiveTitlesWhole(); } public void ShowByComponentAsOneSet() { OptionSetX.SetTitleMode("X = Y"); OptionSetY.Hide(); - AccelCharts.SetWidened(); - SetActiveTitlesByComponents(); + //SetActiveTitlesByComponents(); } public void ShowByComponentAsTwoSets() @@ -192,7 +190,6 @@ namespace grapher.Models.Options OptionSetX.SetTitleMode("X"); OptionSetY.SetTitleMode("Y"); OptionSetY.Show(); - AccelCharts.SetNarrowed(); } public void ShowByComponentSet() |