1 files changed, 92 insertions, 46 deletions

diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 25aa534..c0cc413 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.IO;
 using System.Windows.Forms;
 using System.Threading;
 using System.Text;
@@ -21,22 +22,41 @@ namespace grapher.Models.Serialized
             ToolStripMenuItem showVelocityAndGain,
             DeviceIDManager deviceIDManager)
         {
-            ActiveAccel = activeAccel;
             DpiField = dpiField;
             PollRateField = pollRateField;
             AutoWriteMenuItem = autoWrite;
             ShowLastMouseMoveMenuItem = showLastMouseMove;
             ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
             DeviceIDManager = deviceIDManager;
+
+            SetActiveFields(activeAccel);
+
+            GuiSettings = GUISettings.MaybeLoad();
+
+            if (GuiSettings is null)
+            {
+                GuiSettings = MakeGUISettingsFromFields();
+                GuiSettings.Save();
+            }
+            else
+            {
+                UpdateFieldsFromGUISettings();
+            }
+
+            UserSettings = InitUserSettings();
         }
 
         #endregion Constructors
 
         #region Properties
 
-        public ManagedAccel ActiveAccel { get; set; }
+        public GUISettings GuiSettings { get; private set; }
+
+        public ManagedAccel ActiveAccel { get; private set; }
+
+        public ExtendedSettings ActiveSettings { get; private set; }
 
-        public RawAccelSettings RawAccelSettings { get; private set; }
+        public DriverSettings UserSettings { get; private set; }
 
         public Field DpiField { get; private set; }
 
@@ -53,47 +73,54 @@ namespace grapher.Models.Serialized
         #endregion Properties
 
         #region Methods
-        public SettingsErrors TryUpdateActiveSettings(DriverSettings settings)
-        {
-            var errors = TryUpdateAccel(settings);
-
-            if (errors.Empty())
-            {
-                RawAccelSettings.AccelerationSettings = settings;
-                RawAccelSettings.GUISettings = MakeGUISettingsFromFields();
-                RawAccelSettings.Save();
-            }
 
-            return errors;
+        public void DisableDriver()
+        {
+            var defaultSettings = new ExtendedSettings();
+            ActiveSettings = defaultSettings;
+            ActiveAccel.Settings = defaultSettings;
+            new Thread(() => ActiveAccel.Activate()).Start();
         }
 
         public void UpdateFieldsFromGUISettings()
         {
-            DpiField.SetToEntered(RawAccelSettings.GUISettings.DPI);
-            PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
-            ShowLastMouseMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowLastMouseMove;
-            ShowVelocityAndGainMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowVelocityAndGain;
-            AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
+            DpiField.SetToEntered(GuiSettings.DPI);
+            PollRateField.SetToEntered(GuiSettings.PollRate);
+            ShowLastMouseMoveMenuItem.Checked = GuiSettings.ShowLastMouseMove;
+            ShowVelocityAndGainMoveMenuItem.Checked = GuiSettings.ShowVelocityAndGain;
+            AutoWriteMenuItem.Checked = GuiSettings.AutoWriteToDriverOnStartup;
         }
 
-        public SettingsErrors TryUpdateAccel(DriverSettings settings)
+        public SettingsErrors TryActivate(DriverSettings settings)
         {
-            var accel = new ManagedAccel(settings);
-            var errors = SendToDriverSafe(accel);
-            if (errors.Empty()) ActiveAccel= accel;
-            return errors;
-        }
+            var errors = new SettingsErrors(settings);
 
-        public static void SendToDriver(ManagedAccel accel)
-        {
-            new Thread(() => accel.Activate()).Start();
+            if (errors.Empty())
+            {
+                GuiSettings = MakeGUISettingsFromFields();
+                GuiSettings.Save();
+
+                UserSettings = settings;
+                File.WriteAllText(Constants.DefaultSettingsFileName, RaConvert.Settings(settings));
+
+                ActiveSettings = new ExtendedSettings(settings);
+                ActiveAccel.Settings = ActiveSettings;
+
+                new Thread(() => ActiveAccel.Activate()).Start();
+            }
+
+            return errors;
         }
 
-        public static SettingsErrors SendToDriverSafe(ManagedAccel accel)
+        public void SetHiddenOptions(DriverSettings settings)
         {
-            var errors = new SettingsErrors(accel.Settings);
-            if (errors.Empty()) SendToDriver(accel);
-            return errors;
+            settings.snap = UserSettings.snap;
+            settings.maximumSpeed = UserSettings.maximumSpeed;
+            settings.minimumSpeed = UserSettings.minimumSpeed;
+            settings.minimumTime = UserSettings.minimumTime;
+            settings.maximumTime = UserSettings.maximumTime;
+            settings.ignore = UserSettings.ignore;
+            settings.directionalMultipliers = UserSettings.directionalMultipliers;
         }
 
         public GUISettings MakeGUISettingsFromFields()
@@ -108,32 +135,51 @@ namespace grapher.Models.Serialized
             };
         }
 
-        // Returns true when file settings are active
-        public bool Startup()
+        public bool TableActive()
+        {
+            return ActiveSettings.tables.x != null || ActiveSettings.tables.y != null;
+        }
+
+        public void SetActiveFields(ManagedAccel activeAccel)
         {
-            if (RawAccelSettings.Exists())
+            ActiveAccel = activeAccel;
+            ActiveSettings = activeAccel.Settings;
+        }
+
+        private DriverSettings InitUserSettings()
+        {
+            var path = Constants.DefaultSettingsFileName;
+            if (File.Exists(path))
             {
                 try
                 {
-                    RawAccelSettings = RawAccelSettings.Load(() => MakeGUISettingsFromFields());
-                    UpdateFieldsFromGUISettings();
-                    if (RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup)
+                    DriverSettings settings = RaConvert.Settings(File.ReadAllText(path));
+
+                    if (!GuiSettings.AutoWriteToDriverOnStartup || 
+                        TableActive() || 
+                        TryActivate(settings).Empty())
                     {
-                        TryUpdateAccel(RawAccelSettings.AccelerationSettings);
+                        return settings;
                     }
-                    return RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
+
                 }
                 catch (JsonException e)
                 {
-                    Console.WriteLine($"bad settings: {e}");
+                    System.Diagnostics.Debug.WriteLine($"bad settings: {e}");
                 }
             }
 
-            RawAccelSettings = new RawAccelSettings(
-                ManagedAccel.GetActive().Settings,
-                MakeGUISettingsFromFields());
-            RawAccelSettings.Save();
-            return true;
+            if (!TableActive())
+            {
+                File.WriteAllText(path, RaConvert.Settings(ActiveSettings.baseSettings));
+                return ActiveSettings.baseSettings;
+            }
+            else
+            {
+                var defaultSettings = new DriverSettings();
+                File.WriteAllText(path, RaConvert.Settings(defaultSettings));
+                return defaultSettings;
+            }
         }
 
         #endregion Methods