From 46f5f70e6055234bce3e9a105ab1ba86248b1713 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 22 Apr 2019 22:46:43 +0300
Subject: Implemented Volume color space gradients. Implemented volume
 gradients on PPC. Improved job running aspects on PPC.

---
 .../ViewModels/MainViewVM.cs                       | 30 +++++++++++++++++-----
 .../Views/JobView.xaml                             |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

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

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 0299940d3..4d8ec954e 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
@@ -966,9 +966,23 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         private void MachineOperator_PreparingJobProgress(object sender, PreparingJobProgressEventArgs e)
         {
-            if (_preparingTaskItem != null)
+            var percent = (e.Progress / e.Total * 100d);
+
+            if (_preparingTaskItem == null && percent == 0)
+            {
+                _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
+            }
+            else if (percent == 100)
             {
-                _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+                _preparingTaskItem.Pop();
+                _preparingTaskItem = null;
+            }
+            else
+            {
+                if (_preparingTaskItem != null)
+                {
+                    _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+                }
             }
         }
 
@@ -1327,11 +1341,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 if (resumeFunc == null)
                 {
-                    using (var item = _notification.PushTaskItem("Preparing job for printing..."))
-                    {
-                        _preparingTaskItem = item;
-                        JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
-                    }
+                    JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
                 }
                 else
                 {
@@ -1408,6 +1418,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Canceled += (x, y) =>
                 {
+                    if (_preparingTaskItem != null)
+                    {
+                        _preparingTaskItem.Pop();
+                        _preparingTaskItem = null;
+                    }
+
                     LogManager.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     _eventLogger.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     StopRecordingIfInProgress();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index bfa951c3b..a5d137e67 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1220,7 +1220,7 @@
                                     </Grid>
 
                                     <Grid DockPanel.Dock="Right" Margin="0 0 10 0">
-                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}" IsEnabled="{Binding MachineOperator.CanPrint}">
                                             <Button Height="60" Width="280" Command="{Binding StartJobCommand}" Click="OnJobStartClick">
                                                 <StackPanel Orientation="Horizontal">
                                                     <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="ClockFast" />
-- 
cgit v1.3.1