Improved fix for incorrect final nl/cm calc.

1 files changed, 16 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 6355997f7..7dc60ec73 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1920,10 +1920,10 @@ namespace Tango.Integration.Operation
                 jobStop.OffsetPercent = stop.OffsetPercent;
                 jobStop.OffsetMeters = stop.OffsetMeters;
 
-                //if (stop.LiquidVolumes == null)
-                //{
-                stop.SetLiquidVolumes(job.Machine.Configuration, job.Rml, processParameters);
-                //}
+                if (stop.LiquidVolumes == null)
+                {
+                    stop.SetLiquidVolumes(job.Machine.Configuration, job.Rml, processParameters);
+                }
 
                 foreach (var liquidVolume in stop.LiquidVolumes)
                 {
@@ -2522,6 +2522,18 @@ namespace Tango.Integration.Operation
                 {
                     throw new NullReferenceException("Could not locate any process parameters table in group " + processGroup.Name + " for RML " + job.Rml.Name);
                 }
+
+                try
+                {
+                    foreach (var stop in job.Segments.SelectMany(x => x.BrushStops).ToList())
+                    {
+                        stop.SetLiquidVolumes(job.Machine.Configuration, job.Rml, processParameters);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw LogManager.Log(new InvalidOperationException($"An error occurred while trying to apply final liquid volumes.\n{ex.Message}"));
+                }
             });
 
             return await Print(job, processParameters, config);