aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-10-15 17:24:24 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-10-15 17:25:28 +0300
commit6633cb47da2bd14a5bbe356a7c4602c6d09462d1 (patch)
treea2f14629598abdf8e691a04aaa7ff3c906f6c2f3 /Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
parent765986922827db6d0f92ce1de6f53519c0674344 (diff)
downloadTango-6633cb47da2bd14a5bbe356a7c4602c6d09462d1.tar.gz
Tango-6633cb47da2bd14a5bbe356a7c4602c6d09462d1.zip
pressing "resume" the dyed amount is doubled
Related Work Items: #9046
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs')
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs11
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;