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

1 files changed, 7 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index df320527e..a33ee3165 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -3254,10 +3254,10 @@ namespace Tango.Integration.Operation
                     }
 
                     double resumePreProgress = 0;
-
+                    
                     if (config.ResumeConfig != null)
                     {
-                        resumePreProgress = config.ResumeConfig.GlobalStartPosition - processParameters.DryerBufferLengthMeters;
+                        resumePreProgress = config.ResumeConfig.GlobalStartPosition - config.ResumeConfig.FirstUnitStartPosition;//- processParameters.DryerBufferLengthMeters;
                         request.FirstUnitStartPosition = config.ResumeConfig.FirstUnitStartPosition;
                         //LogManager.Log($" resumePreProgress = {resumePreProgress}, GlobalStartPosition {config.ResumeConfig.GlobalStartPosition}  FirstUnitStartPosition {request.FirstUnitStartPosition}");
                         request.JobTicket.Length = (request.JobTicket.Length / Math.Max(request.JobTicket.NumberOfUnits, 1)) * (int)Math.Max(config.ResumeConfig.RemainingUnits, 1);
@@ -3268,8 +3268,11 @@ namespace Tango.Integration.Operation
                     {
                         if (!completed)
                         {
-                            response.Message.Status.Progress += resumePreProgress;
-                               
+                           if(resumePreProgress > 0 )
+                           {
+                              response.Message.Status.Progress += resumePreProgress;//LogManager.Log($" MACHINE OPERATOR Added   Progress = {response.Message.Status.Progress}");  
+                           }
+                           
                             handler.RaiseStatusReceived(response.Message.Status);
                             _last_job_status = handler.Status;