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

2 files changed, 28 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
index 5e0e6d838..e6d5674e1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
@@ -22,6 +22,8 @@ namespace Tango.MachineStudio.Developer
 
         public List<ParameterIndex> ProcessParametersIndices { get; set; }
 
+        public String DefaultJobRmlGuid { get; set; }
+
         public DeveloperModuleSettings()
         {
             ProcessParametersIndices = new List<ParameterIndex>();
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 79b1f1c17..f15ffb2c7 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
@@ -1773,6 +1773,10 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             SelectedMachineJob.Segments = SelectedMachineJob.Segments;
                         });
 
+                        var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+                        settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
+                        settings.Save();
+
                     });
                 }
 
@@ -2015,16 +2019,37 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     LogManager.Log(String.Format("Adding new job {0}...", jobName));
 
+                    var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+
                     Job newJob = new Job();
                     newJob.Name = jobName;
                     newJob.CreationDate = DateTime.UtcNow;
                     newJob.UserGuid = _authentication.CurrentUser.Guid;
-                    newJob.Rml = _machineDbContext.Rmls.FirstOrDefault();
+
+                    if (String.IsNullOrWhiteSpace(settings.DefaultJobRmlGuid))
+                    {
+                        newJob.Rml = _machineDbContext.Rmls.FirstOrDefault();
+                    }
+                    else
+                    {
+                        var rml = _machineDbContext.Rmls.SingleOrDefault(x => x.Guid == settings.DefaultJobRmlGuid);
+                        if (rml != null)
+                        {
+                            newJob.Rml = rml;
+                        }
+                        else
+                        {
+                            newJob.Rml = _machineDbContext.Rmls.FirstOrDefault();
+                        }
+                    }
+
                     newJob.WindingMethod = _machineDbContext.WindingMethods.FirstOrDefault();
                     newJob.SpoolType = _machineDbContext.SpoolTypes.FirstOrDefault();
                     newJob.ColorSpace = _machineDbContext.ColorSpaces.FirstOrDefault();
                     newJob.Machine = SelectedMachine;
 
+                    
+
                     SelectedMachine.Jobs.Add(newJob);
                     var segment = newJob.AddSolidSegment();
                     segment.BrushStops[0].SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);