diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.BL/Dispensing')
4 files changed, 8 insertions, 43 deletions
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs index 879f31619..cceabb571 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs @@ -29,11 +29,6 @@ namespace Tango.BL.Dispensing } } - public virtual double CalculateNanoliterPerCentimeter(double volume, double maxNanoliterPerCentimeter) - { - return (volume / 100d) * maxNanoliterPerCentimeter; - } - /// <summary> /// Calculates the required nanoliter per second. /// </summary> @@ -58,17 +53,7 @@ namespace Tango.BL.Dispensing /// <returns></returns> public virtual double CalculatePulsePerSecond(LiquidVolume liquidVolume) { - return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep / (double)liquidVolume.DispenserStepDivision; - } - - /// <summary> - /// Calculates the required full pulses per second. - /// </summary> - /// <param name="liquidVolume">The liquid volume.</param> - /// <returns></returns> - public double CalculatePulsePerSecondFull(LiquidVolume liquidVolume) - { - return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep; + return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep * 8d; } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs index 3dd38fb10..a41eb1040 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs @@ -45,17 +45,6 @@ namespace Tango.BL.Dispensing } /// <summary> - /// Calculates the full pulse per second. - /// </summary> - /// <param name="liquidVolume">The liquid volume.</param> - /// <returns></returns> - public static double CalculatePulsePerSecondFull(LiquidVolume liquidVolume) - { - IDispensingCalc formula = DispensingCalcResolver.Resolve(liquidVolume); - return formula.CalculatePulsePerSecondFull(liquidVolume); - } - - /// <summary> /// Coerces the volume. /// </summary> /// <param name="liquidVolume">The liquid volume.</param> diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs index 7ec715a88..7c5928bf6 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs @@ -29,13 +29,6 @@ namespace Tango.BL.Dispensing double CalculatePulsePerSecond(LiquidVolume liquidVolume); /// <summary> - /// Calculates the required full pulses per second. - /// </summary> - /// <param name="liquidVolume">The liquid volume.</param> - /// <returns></returns> - double CalculatePulsePerSecondFull(LiquidVolume liquidVolume); - - /// <summary> /// Coerces the specified liquid volume. /// </summary> /// <param name="liquidVolume">The liquid volume.</param> 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 |