take remote

1 files changed, 79 insertions, 56 deletions

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 3a1f3fb11..93baf3b9d 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
@@ -1034,6 +1034,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             var percent = (e.Progress / e.Total * 100d);
 
+            if (_preparingTaskItem != null)
+            {
+                _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+            }
+
             if (_preparingTaskItem == null && percent == 0)
             {
                 _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
@@ -1043,13 +1048,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 _preparingTaskItem.Pop();
                 _preparingTaskItem = null;
             }
-            else
-            {
-                if (_preparingTaskItem != null)
-                {
-                    _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
-                }
-            }
         }
 
         private void MachineOperator_ResumingJob(object sender, ResumingJobEventArgs e)
@@ -1481,15 +1479,39 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Failed += (x, ex) =>
                 {
-                    LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                    _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                    SetJobFailed();
+                    if (ex is InsufficientLiquidQuantityException)
+                    {
+                        InvokeUI(() =>
+                        {
+                            _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex as InsufficientLiquidQuantityException), (_) =>
+                            {
 
-                    InvokeUI(() =>
+                                MachineOperator.EnableJobLiquidQuantityValidation = false;
+                                StartJob();
+
+                            }, () =>
+                            {
+                                SetJobFailed();
+
+                                InvokeUI(() =>
+                                {
+                                    StopRecordingIfInProgress();
+                                });
+                            });
+                        });
+                    }
+                    else
                     {
-                        _notification.ShowError("Job failed. " + ex.FlattenMessage());
-                        StopRecordingIfInProgress();
-                    });
+                        LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                        _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                        SetJobFailed();
+
+                        InvokeUI(() =>
+                        {
+                            _notification.ShowError("Job failed. " + ex.FlattenMessage());
+                            StopRecordingIfInProgress();
+                        });
+                    }
                 };
 
                 JobHandler.Finalizing += (_, __) =>
@@ -1521,16 +1543,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     //Finally Canceled..
                 };
             }
-            catch (InsufficientLiquidQuantityException ex)
-            {
-                _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex), (x) =>
-                {
-
-                    MachineOperator.EnableJobLiquidQuantityValidation = false;
-                    StartJob();
-
-                }, () => { });
-            }
             catch (Exception ex)
             {
                 LogManager.Log(ex);
@@ -1908,50 +1920,60 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 CanWork = false;
 
-                using (_notification.PushTaskItem("Saving job details..."))
+                try
                 {
-                    await Task.Factory.StartNew(() =>
+                    using (_notification.PushTaskItem("Saving job details..."))
                     {
-                        LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
-                        ActiveJob.LastUpdated = DateTime.UtcNow;
-                        ActiveJob.Rml = SelectedRML;
-                        ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
-                        _activeJobDbContext.SaveChanges();
-
-                        _machineDbContext.Entry(SelectedMachineJob).Reload();
+                        await Task.Factory.StartNew(() =>
+                        {
+                            LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
+                            ActiveJob.LastUpdated = DateTime.UtcNow;
+                            ActiveJob.Rml = SelectedRML;
+                            ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
+                            _activeJobDbContext.SaveChanges();
 
+                            _machineDbContext.Entry(SelectedMachineJob).Reload();
 
-                        _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
 
-                        foreach (var segment in SelectedMachineJob.Segments.ToList())
-                        {
-                            _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load();
+                            _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
 
-                            foreach (var brushStop in segment.BrushStops.ToList())
+                            foreach (var segment in SelectedMachineJob.Segments.ToList())
                             {
-                                _machineDbContext.Entry(brushStop).Reload();
-                            }
+                                _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load();
 
-                            _machineDbContext.Entry(segment).Reload();
-                        }
+                                foreach (var brushStop in segment.BrushStops.ToList())
+                                {
+                                    _machineDbContext.Entry(brushStop).Reload();
+                                }
 
-                        InvokeUI(() =>
-                        {
-                            SelectedMachineJob.Segments = SelectedMachineJob.Segments;
-                        });
+                                _machineDbContext.Entry(segment).Reload();
+                            }
 
-                        var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
-                        settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
-                        settings.Save();
+                            InvokeUI(() =>
+                            {
+                                SelectedMachineJob.Segments = SelectedMachineJob.Segments;
+                            });
 
-                        if (ActiveJob != null)
-                        {
-                            _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
-                        }
-                    });
-                }
+                            var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+                            settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
+                            settings.Save();
 
-                CanWork = true;
+                            if (ActiveJob != null)
+                            {
+                                _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error saving active job.");
+                    _notification.ShowError($"An error occurred while trying to save the current job.\n{ex.FlattenMessage()}");
+                }
+                finally
+                {
+                    CanWork = true;
+                }
             }
         }
 
@@ -2261,6 +2283,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             return;
                         }
                         SelectedSegment.BrushStops.Remove(x);
+                        _activeJobDbContext.BrushStops.Remove(x);
                     });
 
                     ArrangeBrushStopsIndices();