Fix for app stability

Jogging speed and distance selectors replaced with Non linear sliders
IlyaChernov · Sep 19, 2020 · 8c23414 · 8c23414
1 parent a66c320
commit 8c23414
Show file tree

Hide file tree

Showing 11 changed files with 215 additions and 65 deletions.
diff --git a/grbl.Master.Model/ApplicationSettings.cs b/grbl.Master.Model/ApplicationSettings.cs
@@ -8,6 +8,7 @@ public class ApplicationSettings : NotifyPropertyChanged
         public double JoggingDistance { get; set; }
 
         public ObservableCollection<double> FeedRates { get; set; } = new ObservableCollection<double> { 5, 10, 50, 100, 500, 1000 };
+        public double SliderLinearity { get; set; }
 
         public double FeedRate { get; set; }
 

diff --git a/grbl.Master.Model/CommandSource.cs b/grbl.Master.Model/CommandSource.cs
@@ -7,13 +7,16 @@
     using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Linq;
+    using System.Threading;
 
     public class CommandSource : NotifyPropertyChanged
     {
         private readonly Stopwatch _stopWatch = new Stopwatch();
 
         private bool _needsPurge;
 
+        private readonly SynchronizationContext _uiContext;
+
         private ConcurrentQueue<string> CommandQueue { get; } = new ConcurrentQueue<string>();
 
         public TimeSpan Elapsed => _stopWatch.Elapsed;
@@ -31,6 +34,7 @@ public class CommandSource : NotifyPropertyChanged
 
         public CommandSource(CommandSourceType type, CommandSourceRunMode mode)
         {
+            _uiContext = SynchronizationContext.Current;
             Type = type;
             Mode = mode;
         }
@@ -107,7 +111,12 @@ public void Purge()
             {
                 CommandQueue.TryDequeue(out var dummy);
             }
-            CommandList.Clear();
+
+            _uiContext.Send(
+                state =>
+                    {
+                        CommandList.Clear();
+                    }, null);
 
             _stopWatch.Reset();
         }

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
@@ -23,5 +23,8 @@
     <Setting Name="JoggingSpeed" Type="System.Double" Scope="User">
       <Value Profile="(Default)">1000</Value>
     </Setting>
+    <Setting Name="SliderLinearity" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/grbl.Master.Model/app.config b/grbl.Master.Model/app.config
@@ -48,6 +48,9 @@
       <setting name="JoggingSpeed" serializeAs="String">
         <value>1000</value>
       </setting>
+      <setting name="SliderLinearity" serializeAs="String">
+        <value>1</value>
+      </setting>
     </grbl.Master.Model.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/grbl.Master.Service/ApplicationSettingsService.cs b/grbl.Master.Service/ApplicationSettingsService.cs
@@ -42,6 +42,8 @@ public void Save()
 
             Model.Properties.Settings.Default.JoggingSpeed = Settings.FeedRate;
 
+            Model.Properties.Settings.Default.SliderLinearity = Settings.SliderLinearity;
+
             Model.Properties.Settings.Default.Save();
             Model.Properties.Settings.Default.Reload();
         }
@@ -114,6 +116,8 @@ public void Load()
             Settings.JoggingDistance = Model.Properties.Settings.Default.JoggingDistance;
 
             Settings.FeedRate = Model.Properties.Settings.Default.JoggingSpeed;
+
+            Settings.SliderLinearity = Model.Properties.Settings.Default.SliderLinearity;
         }
     }
 }
diff --git a/grbl.Master.UI/App.xaml b/grbl.Master.UI/App.xaml
@@ -8,6 +8,7 @@
             </ResourceDictionary.MergedDictionaries>
             <BooleanToVisibilityConverter x:Key="BoolToVis" />
             <converters:StringIntegerToBool x:Key="StrIntToBool" />
+            <converters:NonLinearDouble x:Key="NonLinearDouble" />
             <converters:IntegerToBinaryString x:Key="IntegerToBinaryString" />
             <converters:IntegerMaskToAxisState x:Key="IntegerMaskToAxisState" />
             <converters:IntegerMask3ToDescription x:Key="IntegerMask3ToDescription" />

diff --git a/grbl.Master.UI/Converters/NonLinearDouble.cs b/grbl.Master.UI/Converters/NonLinearDouble.cs
@@ -0,0 +1,44 @@
+namespace grbl.Master.UI.Converters
+{
+    using System;
+    using System.Collections.ObjectModel;
+    using System.Globalization;
+    using System.Linq;
+    using System.Windows.Controls;
+    using System.Windows.Data;
+    using System.Windows.Media;
+
+    public class NonLinearDouble : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (parameter != null && parameter is Label powLbl && powLbl.Content is double pow)
+            {
+                pow = pow < 1 ? 1 : pow;
+                if (value != null)
+                {
+                    if (value is double val)
+                    {
+                        return Math.Pow(val, 1d / pow);
+                    }
+
+                    if (value is ObservableCollection<double> vals && vals.Any())
+                    {
+                        return new DoubleCollection(vals.Select(val => Math.Pow(val, 1d / pow)));
+                    }
+                }
+            }
+
+            return 0d;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is double val && parameter != null && parameter is Label powLbl && powLbl.Content is double pow)
+            {
+                return Math.Round(Math.Pow(val, pow), 3);
+            }
+            return 0d;
+        }
+    }
+}
diff --git a/grbl.Master.UI/ViewModels/MasterViewModel.cs b/grbl.Master.UI/ViewModels/MasterViewModel.cs
@@ -21,12 +21,14 @@
     using System.Reflection;
     using System.Threading;
     using System.Windows.Controls;
+    using System.Windows.Media;
     using System.Xml;
 
     using grbl.Master.Common.Enum;
     using grbl.Master.Common.Interfaces.BL;
     using grbl.Master.Common.Interfaces.Service;
     using grbl.Master.Model.Interface;
+    using grbl.Master.UI.Converters;
 
     using Xceed.Wpf.Toolkit;
 
@@ -53,6 +55,8 @@ public class MasterViewModel : Screen
 
         private string _manualCommand;
 
+        private NonLinearDouble _nonLinearDoubleConverter = new NonLinearDouble();
+
         public MasterViewModel(
             IComService comService,
             IGrblStatus grblStatus,
@@ -119,6 +123,10 @@ public ObservableCollection<double> JoggingDistances
             }
         }
 
+        public double JoggingDistancesFirst => JoggingDistances.Any() ? JoggingDistances.First() : 0;
+
+        public double JoggingDistancesLast => JoggingDistances.Any() ? JoggingDistances.Last() : 0;
+
         public ObservableCollection<double> FeedRates
         {
             get => _applicationSettingsService.Settings.FeedRates;
@@ -129,6 +137,25 @@ public ObservableCollection<double> FeedRates
             }
         }
 
+        public double FeedRatesFirst => FeedRates.Any() ? FeedRates.First() : 0;
+
+        public double FeedRatesLast => FeedRates.Any() ? FeedRates.Last() : 0;
+
+        public double SliderLinearity
+        {
+            get => _applicationSettingsService.Settings.SliderLinearity < 1 ? 1 : _applicationSettingsService.Settings.SliderLinearity;
+
+            set
+            {
+                _applicationSettingsService.Settings.SliderLinearity = value;
+                this.NotifyOfPropertyChange(() => SliderLinearity);
+                NotifyOfPropertyChange(() => FeedRates);
+                NotifyOfPropertyChange(() => JoggingDistances);
+                _applicationSettingsService.Save();
+            }
+        }
+
+
         public ObservableCollection<Macros> Macroses => _applicationSettingsService.Settings.Macroses;
 
         public TimeSpan Elapsed => _commandSender.FileCommands.Elapsed;
@@ -168,6 +195,40 @@ public double SelectedFeedRate
             }
         }
 
+        /*public DoubleCollection FeedRateTicks
+        {
+            get
+            {
+                var result = new DoubleCollection();
+                
+                FeedRates.ToList().ForEach(
+                    item =>
+                        {
+                            result.Add((double)_nonLinearDoubleConverter.Convert(item, null, 3d, CultureInfo.CurrentCulture));
+                        });
+
+                return result;
+            }
+        }
+
+        public DoubleCollection JoggingDistanceTicks
+        {
+            get
+            {
+                var result = new DoubleCollection();
+
+                JoggingDistances.ToList().ForEach(
+                    item =>
+                        {
+                            result.Add((double)_nonLinearDoubleConverter.Convert(item, null, 4d, CultureInfo.CurrentCulture));
+                        });
+
+                return result;
+            }
+        }*/
+
+
+
         public int FileLinesCount => _commandSender.FileCommands.CommandCount;
 
         public int FileLinesProcessed => FileCommandsCollection.Count;
@@ -368,7 +429,7 @@ public void RefreshMacroLog()
 
         public void RefreshFullLog()
         {
-            _commandSender.CommunicationLog.Clear();;
+            _commandSender.CommunicationLog.Clear(); ;
         }
 
         public void SendEnterCommand()
@@ -549,7 +610,7 @@ public void CancelMacro()
 
         public void AddMacro()
         {
-            MacrosSelected = new Macros{Command = ""};
+            MacrosSelected = new Macros { Command = "" };
         }
 
         public void UpMacro(Macros macro)