merge

1 files changed, 7 insertions, 9 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
index ee36fd9ef..15e9b69d9 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
@@ -25,15 +25,10 @@ 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);
-
-                nlPcmSum = Math.Max(0, liquidVolume.ProcessParametersTable.MinInkUptake - nlPcmSum);
-
-                if (nlPcmSum < liquidVolume.ProcessParametersTable.MinInkUptake * 0.02d)
-                {
-                    nlPcmSum = 0;
-                }
-
-                return nlPcmSum;
+                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));
             }
             else
             {
@@ -50,6 +45,9 @@ 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