From 9cc18084e2f9db73ce9e2820dfebcab4e50e5730 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 5 May 2019 11:43:19 +0300
Subject: MREGE.

---
 .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 4ce8ab39d..3f28c2cff 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -552,6 +552,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         public IAuthenticationProvider AuthenticationProvider { get; set; }
 
+        public DeveloperModuleSettings Settings
+        {
+            get { return _settings; }
+            set { _settings = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -783,7 +789,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         public override void OnApplicationReady()
         {
-            _settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+            Settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
             SelectedJobs = new ObservableCollection<Job>();
             JobEvents = new ObservableCollection<MachinesEvent>();
@@ -972,7 +978,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
             }
-            else if (percent == 100)
+            else if (percent == 100 && _preparingTaskItem != null)
             {
                 _preparingTaskItem.Pop();
                 _preparingTaskItem = null;
@@ -1341,6 +1347,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 IsFree = false;
                 LogManager.Log("Sending job to machine operator...");
 
+                MachineOperator.GradientGenerationConfiguration.IsEnabled = Settings.EnableGradientGeneration;
+                MachineOperator.GradientGenerationConfiguration.ResolutionCM = Settings.GradientResolutionCM;
+
                 if (resumeFunc == null)
                 {
                     JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
-- 
cgit v1.3.1