From 6633cb47da2bd14a5bbe356a7c4602c6d09462d1 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 15 Oct 2023 17:24:24 +0300 Subject: pressing "resume" the dyed amount is doubled Related Work Items: #9046 --- .../Tango.Integration/Operation/MachineOperator.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs') 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; -- cgit v1.3.1