diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration')
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs index d21dcc781..7aa491369 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs @@ -27,7 +27,6 @@ namespace Tango.Integration.Operation protected double _last_progress; protected const int PROGRESS_REPORT_RANGE_METERS = 5; protected bool loggedContinueMessage; - private MachineTypes _machineType; #region Events @@ -156,10 +155,9 @@ namespace Tango.Integration.Operation /// Initializes a new instance of the <see cref="JobHandler"/> class. /// </summary> /// <param name="cancelAction">The cancel action.</param> - public JobHandler(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode, MachineTypes machineType) : this() + public JobHandler(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode) : this() { _mode = mode; - _machineType = machineType; ProcessParameters = processParameters; Job = job; diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 92fc9cc1c..49e7c76e2 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -1801,7 +1801,7 @@ namespace Tango.Integration.Operation handler.CanCancel = true; LogManager.Log(ex, "Failed to cancel job."); } - }, job, jobTicket, processParameters, JobHandlingMode, MachineType); + }, job, jobTicket, processParameters, JobHandlingMode); handler.StatusChanged += (x, s) => { @@ -2729,7 +2729,7 @@ namespace Tango.Integration.Operation List<RequiredLiquid> requiredLiquids = null; //Validate liquid quantities - if (EnableJobLiquidQuantityValidation) + if (EnableJobLiquidQuantityValidation && MachineType == MachineTypes.TS1800) { if (!originalJob.Rml.UseColorLibGradients) //Validate liquid quantities when ColorLib generate gradient is disabled { @@ -2915,7 +2915,7 @@ namespace Tango.Integration.Operation handler.CanCancel = true; LogManager.Log(ex, "Failed to cancel job."); } - }, clonedJob, ticket, processParameters, JobHandlingMode, MachineType); + }, clonedJob, ticket, processParameters, JobHandlingMode); handler.StatusChanged += (x, s) => { |