From 93e915dd3fc06ae20b29aa927966676b9f8b7c5a Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 1 Mar 2018 12:01:46 +0200 Subject: Lots of work ! --- .../Tango.Integration/Operators/MachineOperator.cs | 27 ++++++++-------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs') diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs index 6432e279c..1cc7b14c7 100644 --- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs @@ -252,25 +252,13 @@ namespace Tango.Integration.Operators ticket.InterSegmentLength = job.InterSegmentLength; ticket.Length = job.Length; ticket.WindingMethod = (JobWindingMethod)job.WindingMethod.Code; + ticket.Spool = new JobSpool(); - ProcessParameters process = new ProcessParameters(); - process.Name = processParameters.Name; - process.DyeingSpeed = processParameters.DyeingSpeed; - process.MinInkUptake = processParameters.MinInkUptake; - process.MixerTemp = processParameters.MixerTemp; - process.HeadZone1Temp = processParameters.HeadZone1Temp; - process.HeadZone2Temp = processParameters.HeadZone2Temp; - process.HeadZone3Temp = processParameters.HeadZone3Temp; - process.HeadAirFlow = processParameters.HeadAirFlow; - process.FeederTension = processParameters.FeederTension; - process.PullerTension = processParameters.PullerTension; - process.DryerBufferLength = processParameters.DryerBufferLength; - process.DryerZone1Temp = processParameters.DryerZone1Temp; - process.DryerZone2Temp = processParameters.DryerZone2Temp; - process.DryerZone3Temp = processParameters.DryerZone3Temp; - process.DryerAirFlow = processParameters.DryerAirFlow; - process.WinderTension = processParameters.WinderTension; + job.SpoolType.MapPrimitivesTo(ticket.Spool); + ticket.Spool.JobSpoolType = (JobSpoolType)job.SpoolType.Code; + ProcessParameters process = new ProcessParameters(); + processParameters.MapPrimitivesTo(process); ticket.ProcessParameters = process; foreach (var segment in job.Segments) @@ -286,6 +274,11 @@ namespace Tango.Integration.Operators jobStop.OffsetPercent = stop.OffsetPercent; jobStop.OffsetMeters = stop.OffsetMeters; + if (stop.LiquidVolumes == null) + { + stop.SetLiquidVolumes(job.Machine.Configuration, job.Rml, processParameters); + } + foreach (var liquidVolume in stop.LiquidVolumes) { JobDispenser dispenser = new JobDispenser(); -- cgit v1.3.1