merge lut2

3 files changed, 120 insertions, 187 deletions

diff --git a/grapher/Models/Serialized/GUISettings.cs b/grapher/Models/Serialized/GUISettings.cs
index a4eb627..e7b67ba 100644
--- a/grapher/Models/Serialized/GUISettings.cs
+++ b/grapher/Models/Serialized/GUISettings.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.IO;
 
 namespace grapher.Models.Serialized
 {
@@ -70,6 +71,32 @@ namespace grapher.Models.Serialized
                 StreamingMode.GetHashCode();
         }
 
+        public void Save()
+        {
+            File.WriteAllText(Constants.GuiConfigFileName, JsonConvert.SerializeObject(this));
+        }
+
+        public static GUISettings MaybeLoad()
+        {
+            GUISettings settings = null;
+
+            try
+            {
+                settings = JsonConvert.DeserializeObject<GUISettings>(
+                    File.ReadAllText(Constants.GuiConfigFileName));
+            }
+            catch (Exception ex)
+            {
+                if (!(ex is JsonException || ex is FileNotFoundException))
+                {
+                    throw;
+                }
+            }
+
+            return settings;
+        }
+
         #endregion Methods
+
     }
 }
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
deleted file mode 100644
index 17db910..0000000
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.IO;
-using System.Linq;
-
-namespace grapher.Models.Serialized
-{
-    [Serializable]
-    public class RawAccelSettings
-    {
-        #region Fields
-
-        public static readonly string ExecutingDirectory = AppDomain.CurrentDomain.BaseDirectory;
-        public static readonly string DefaultSettingsFile = Path.Combine(ExecutingDirectory, Constants.DefaultSettingsFileName);
-        public static readonly JsonSerializerSettings SerializerSettings = new JsonSerializerSettings
-        {
-            MissingMemberHandling = MissingMemberHandling.Ignore,
-        };
-        #endregion Fields
-
-        #region Constructors
-
-        public RawAccelSettings() { }
-
-        public RawAccelSettings(
-            DriverSettings accelSettings,
-            GUISettings guiSettings)
-        {
-            AccelerationSettings = accelSettings;
-            GUISettings = guiSettings;
-        }
-
-        #endregion Constructors
-
-        #region Properties
-        [JsonProperty(Required = Required.Always)]
-        public GUISettings GUISettings { get; set; }
-
-        [JsonProperty(DriverSettings.Key, Required = Required.Always)]
-        public DriverSettings AccelerationSettings { get; set; }
-
-        #endregion Properties
-
-        #region Methods
-
-        public static RawAccelSettings Load(Func<GUISettings> DefaultGUISettingsSupplier)
-        {
-            return Load(DefaultSettingsFile, DefaultGUISettingsSupplier);
-        }
-
-        public static RawAccelSettings Load(string file, Func<GUISettings> DefaultGUISettingsSupplier)
-        {   
-            try
-            {
-                RawAccelSettings settings = null;
-
-                JObject settingsJObject = JObject.Parse(File.ReadAllText(file));
-                if (settingsJObject.ContainsKey(DriverSettings.Key))
-                {
-                    settings = settingsJObject.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings));
-                }
-                else
-                {
-                    settings = new RawAccelSettings
-                    {
-                        AccelerationSettings = settingsJObject.ToObject<DriverSettings>(),
-                        GUISettings = DefaultGUISettingsSupplier()
-                    };
-                }
-
-                if (settings is null || settings.AccelerationSettings is null)
-                {
-                    throw new JsonException($"{file} contains invalid JSON");
-                }
-
-                return settings;
-            }
-            catch (FileNotFoundException e)
-            {
-                throw new FileNotFoundException($"Settings file does not exist at {file}", e);
-            }
-            catch (JsonException e)
-            {
-                throw new JsonException($"Settings file at {file} does not contain valid Raw Accel Settings.", e);
-            }
-        }
-
-        public static bool Exists()
-        {
-            return Exists(DefaultSettingsFile);
-        }
-
-        public static bool Exists(string file)
-        {
-            return File.Exists(file);
-        }
-
-        public void Save()
-        {
-            Save(DefaultSettingsFile);
-        }
-
-        public void Save(string file)
-        {
-            JObject thisJO = JObject.FromObject(this);
-            AddComments(thisJO);
-            File.WriteAllText(file, thisJO.ToString(Formatting.Indented));
-        }
-
-        private void AddComments(JObject thisJO)
-        {
-            string modes = string.Join(" | ", Enum.GetNames(typeof(AccelMode)));
-            ((JObject)thisJO[DriverSettings.Key])
-                .AddFirst(new JProperty("### Mode Types ###", modes));
-        }
-
-        public bool IsDefaultEquivalent()
-        {
-            return IsDefaultEquivalent(AccelerationSettings);
-        }
-
-        public static bool IsDefaultEquivalent(DriverSettings accelSettings)
-        {
-            bool wholeOrNoY = accelSettings.combineMagnitudes ||
-                accelSettings.modes.y == AccelMode.noaccel;
-
-            return string.IsNullOrEmpty(accelSettings.deviceID) &&
-                accelSettings.sensitivity.x == 1 &&
-                accelSettings.sensitivity.y == 1 &&
-                accelSettings.directionalMultipliers.x <= 0 &&
-                accelSettings.directionalMultipliers.y <= 0 &&
-                accelSettings.rotation == 0 &&
-                accelSettings.snap == 0 &&
-                accelSettings.modes.x == AccelMode.noaccel &&
-                wholeOrNoY;
-        }
-
-        #endregion Methods
-    }
-}
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index c867c0a..6bcfab8 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;
@@ -22,7 +23,6 @@ namespace grapher.Models.Serialized
             ToolStripMenuItem streamingMode,
             DeviceIDManager deviceIDManager)
         {
-            ActiveAccel = activeAccel;
             DpiField = dpiField;
             PollRateField = pollRateField;
             AutoWriteMenuItem = autoWrite;
@@ -30,15 +30,35 @@ namespace grapher.Models.Serialized
             ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
             StreamingModeMenuItem = streamingMode;
             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; }
+        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; }
 
@@ -55,47 +75,55 @@ 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;
-            StreamingModeMenuItem.Checked = RawAccelSettings.GUISettings.StreamingMode;
-            AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
+            DpiField.SetToEntered(GuiSettings.DPI);
+            PollRateField.SetToEntered(GuiSettings.PollRate);
+            ShowLastMouseMoveMenuItem.Checked = GuiSettings.ShowLastMouseMove;
+            ShowVelocityAndGainMoveMenuItem.Checked = GuiSettings.ShowVelocityAndGain;
+            StreamingModeMenuItem.Checked = GUISettings.StreamingMode;
+            AutoWriteMenuItem.Checked = GuiSettings.AutoWriteToDriverOnStartup;
         }
 
-        public SettingsErrors TryUpdateAccel(DriverSettings settings)
+        public SettingsErrors TryActivate(DriverSettings settings)
         {
-            var errors = SendToDriverSafe(settings);
-            if (errors.Empty()) ActiveAccel.UpdateFromSettings(settings);
-            return errors;
-        }
+            var errors = new SettingsErrors(settings);
 
-        public static void SendToDriver(DriverSettings settings)
-        {
-            new Thread(() => DriverInterop.Write(settings)).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(DriverSettings settings)
+        public void SetHiddenOptions(DriverSettings settings)
         {
-            var errors = DriverInterop.GetSettingsErrors(settings);
-            if (errors.Empty()) SendToDriver(settings);
-            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()
@@ -111,32 +139,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(
-                DriverInterop.GetActiveSettings(),
-                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