Incorporated machine type into machine creation and management + job runs.

1 files changed, 12 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
index 68565679a..6285bb7b0 100644
--- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
+++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
@@ -158,11 +158,20 @@ namespace Tango.Integration.JobRuns
                                 run.IsGradient = _job.Segments.Any(x => x.BrushStops.Count > 1);
                                 run.GradientResolutionCm = MachineOperator.GradientGenerationConfiguration.ResolutionCM;
 
+                                if (_defaultMachine != null)
+                                {
+                                    run.MachineType = _defaultMachine.MachineType;
+                                }
+                                else if (_job.Machine != null)
+                                {
+                                    run.MachineType = _job.Machine.MachineType;
+                                }
+
                                 var jobFile = e.Job.ToJobFileWhenLoaded();
 
-                            try
-                            {
-                                if (_job.Designation == JobDesignations.FineTuning)
+                                try
+                                {
+                                    if (_job.Designation == JobDesignations.FineTuning)
                                     {
                                         jobFile.Segments.First().BrushStops.First().ColorSpaceGuid = colorSpaces.First(x => x.Code == (int)ColorSpaces.LAB).Guid;
                                     }