diff options
| -rw-r--r-- | Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs index 40a716c13..2340cdd62 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs @@ -25,10 +25,15 @@ namespace Tango.BL.Dispensing if (liquidVolume.Configuration != null && liquidVolume.RML != null && liquidVolume.ProcessParametersTable != null) { double nlPcmSum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.NanoliterPerCentimeter); - double minInkUptake = liquidVolume.ProcessParametersTable.MinInkUptake; - double virtual_volume = Math.Max(0, minInkUptake - nlPcmSum); - return virtual_volume; - //(liquidVolume.Volume / 100d) * (Math.Min(liquidVolume.LiquidMaxNanoliterPerCentimeter, liquidVolume.ProcessParametersTable.MinInkUptake)); + + nlPcmSum = Math.Max(0, liquidVolume.ProcessParametersTable.MinInkUptake - nlPcmSum); + + //if (liquidVolume.RML.ColorConversionVersion > 3) + //{ + // nlPcmSum = nlPcmSum <= 0.5 ? 0 : nlPcmSum; + //} + + return nlPcmSum; } else { @@ -45,9 +50,6 @@ namespace Tango.BL.Dispensing { if (liquidVolume.ProcessParametersTable != null) { - //double nlPcmSum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.NanoliterPerCentimeter); - //double minInkUptake = liquidVolume.ProcessParametersTable.MinInkUptake; - //double volume = ((liquidVolume.LiquidMaxNanoliterPerCentimeter - nlPcmSum) / liquidVolume.LiquidMaxNanoliterPerCentimeter) * 100d; return Math.Max(100d - liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.Volume), 0); } else |