User selected feeds and speeds are now saved and loaded between app s…

…essions
IlyaChernov · Mar 6, 2020 · db7b4b7 · db7b4b7
1 parent dc0330d
commit db7b4b7
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 6 deletions.
diff --git a/grbl.Master.Model/ApplicationSettings.cs b/grbl.Master.Model/ApplicationSettings.cs
@@ -5,9 +5,12 @@
     public class ApplicationSettings : NotifyPropertyChanged
     {
         public ObservableCollection<double> JoggingDistances { get; set; } = new ObservableCollection<double> { 0.01d, 0.1d, 1d, 5d, 10d, 100d };
+        public double JoggingDistance { get; set; }
 
         public ObservableCollection<double> FeedRates { get; set; } = new ObservableCollection<double> { 5, 10, 50, 100, 500, 1000 };
 
+        public double FeedRate { get; set; }
+
         public ObservableCollection<Macros> Macroses { get; set; } = new ObservableCollection<Macros>();
 
         public int SelectedBaudRate { get; set; }

diff --git a/grbl.Master.Model/Properties/Settings.Designer.cs b/grbl.Master.Model/Properties/Settings.Designer.cs
diff --git a/grbl.Master.Model/Properties/Settings.settings b/grbl.Master.Model/Properties/Settings.settings
@@ -17,5 +17,11 @@
     <Setting Name="JoggingSpeeds" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="JoggingDistance" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">10</Value>
+    </Setting>
+    <Setting Name="JoggingSpeed" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">1000</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/grbl.Master.Model/app.config b/grbl.Master.Model/app.config
@@ -42,6 +42,12 @@
       <setting name="JoggingSpeeds" serializeAs="String">
         <value />
       </setting>
+      <setting name="JoggingDistance" serializeAs="String">
+        <value>10</value>
+      </setting>
+      <setting name="JoggingSpeed" serializeAs="String">
+        <value>1000</value>
+      </setting>
     </grbl.Master.Model.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/grbl.Master.Service/Implementation/ApplicationSettingsService.cs b/grbl.Master.Service/Implementation/ApplicationSettingsService.cs
@@ -37,6 +37,10 @@ public void Save()
 
             Model.Properties.Settings.Default.SelectedComPort = Settings.SelectedComPort;
 
+            Model.Properties.Settings.Default.JoggingDistance = Settings.JoggingDistance;
+
+            Model.Properties.Settings.Default.JoggingSpeed = Settings.FeedRate;
+
             Model.Properties.Settings.Default.Save();
             Model.Properties.Settings.Default.Reload();
         }
@@ -105,6 +109,10 @@ public void Load()
             Settings.SelectedBaudRate = Model.Properties.Settings.Default.SelectedBaudRate;
 
             Settings.SelectedComPort = Model.Properties.Settings.Default.SelectedComPort;
+
+            Settings.JoggingDistance = Model.Properties.Settings.Default.JoggingDistance;
+
+            Settings.FeedRate = Model.Properties.Settings.Default.JoggingSpeed;
         }
     }
 }
diff --git a/grbl.Master.UI/ViewModels/MasterViewModel.cs b/grbl.Master.UI/ViewModels/MasterViewModel.cs
@@ -50,9 +50,9 @@ public class MasterViewModel : Screen
 
         private string _manualCommand;
 
-        private double _selectedFeedRate = 1000;
+        //private double _selectedFeedRate = 1000;
 
-        private double _selectedJoggingDistance = 10;
+        //private double _selectedJoggingDistance = 10;
 
         public MasterViewModel(
             IComService comService,
@@ -143,20 +143,22 @@ public Macros MacrosSelected
 
         public double SelectedJoggingDistance
         {
-            get => _selectedJoggingDistance;
+            get => _applicationSettingsService.Settings.JoggingDistance;
             set
             {
-                _selectedJoggingDistance = value;
+                _applicationSettingsService.Settings.JoggingDistance = value;
+                _applicationSettingsService.Save();
                 NotifyOfPropertyChange(() => SelectedJoggingDistance);
             }
         }
 
         public double SelectedFeedRate
         {
-            get => _selectedFeedRate;
+            get => _applicationSettingsService.Settings.FeedRate;
             set
             {
-                _selectedFeedRate = value;
+                _applicationSettingsService.Settings.FeedRate = value;
+                _applicationSettingsService.Save();
                 NotifyOfPropertyChange(() => SelectedFeedRate);
             }
         }