Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

1 files changed, 9 insertions, 5 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 2cf0e193a..fce1ce046 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -22,6 +22,8 @@ namespace Tango.PPC.Common
     /// <seealso cref="Tango.Settings.SettingsBase" />
     public class PPCSettings : SettingsBase
     {
+        private int _gradientGenerationResolution;
+
         /// <summary>
         /// Gets or sets the state of the application.
         /// </summary>
@@ -105,7 +107,7 @@ namespace Tango.PPC.Common
         /// <summary>
         /// Gets or sets the gradient generation resolution.
         /// </summary>
-        public int GradientGenerationResolution { get; set; }
+        public int GradientGenerationResolution { get => Math.Max(40, _gradientGenerationResolution); set => _gradientGenerationResolution = value; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to enable the application lock screen.
@@ -215,7 +217,7 @@ namespace Tango.PPC.Common
         /// <summary>
         /// Gets or sets the automatic update check interval.
         /// </summary>
-        public TimeSpan AutoUpdateCheckInterval { get; set; }        
+        public TimeSpan AutoUpdateCheckInterval { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to enable the automatic thread loading support.
@@ -308,9 +310,11 @@ namespace Tango.PPC.Common
         /// </summary>
         public bool UseJobsModuleV2 { get; set; }
 
-        public ColorSpaces? DefaultTabColorSpace {
+        public ColorSpaces? DefaultTabColorSpace
+        {
             get;
-            set; }
+            set;
+        }
 
         /// <summary>
         /// Gets or sets the fine tuning trial length in meters.
@@ -335,7 +339,7 @@ namespace Tango.PPC.Common
             JobUploadStrategy = JobUploadStrategy.JobDescriptionFile;
             FineTuningTrialLengthMeters = 200;
             EnableGradientGeneration = true;
-            GradientGenerationResolution = 20;
+            GradientGenerationResolution = 40;
             MachineScanningTimeoutSeconds = 20;
             EmbeddedComPort = "COM10";
             EmbeddedDeviceHint = "Tango USB Serial Port";