diff options
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index a2fc447af..93cb7bbb8 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -3277,17 +3277,17 @@ namespace Tango.Integration.Operation { if (!completed) { - if (resumePreProgress > 0) + if (resumePreProgress > 0 && response.Message.Status.Progress > 0) { - response.Message.Status.Progress += resumePreProgress;//LogManager.Log($" MACHINE OPERATOR Added Progress = {response.Message.Status.Progress}"); + response.Message.Status.Progress += resumePreProgress; } handler.RaiseStatusReceived(response.Message.Status); _last_job_status = handler.Status; if (response.Message.Status.Progress > 0) - { if (oldKeepAlive != UseKeepAlive) + { { UseKeepAlive = oldKeepAlive; } @@ -3306,7 +3306,14 @@ namespace Tango.Integration.Operation if (JobHandlingMode == JobHandlerModes.SettingUp) { - if (response.Message.Status.Progress > processParameters.DryerBufferLengthMeters) + var printingStartPosition = processParameters.DryerBufferLengthMeters; + + if (config != null && config.ResumeConfig != null && config.ResumeConfig.GlobalStartPosition > 0) + { + printingStartPosition = config.ResumeConfig.GlobalStartPosition; + } + + if (response.Message.Status.Progress > printingStartPosition) { if (!completed) { |