Fixed issue with job completion on emulator.

Added liquid volumes grid full step.
Added full step to dispensing calculations.
Fixed issue with gradient generation progress on MS.
Worked on software items doc.

4 files changed, 31 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
index e0f16d4d4..dcca5817c 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
@@ -57,6 +57,16 @@ namespace Tango.BL.Dispensing
         }
 
         /// <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;
+        }
+
+        /// <summary>
         /// Coerces the specified liquid volume.
         /// </summary>
         /// <param name="liquidVolume">The liquid volume.</param>
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs
index a41eb1040..3dd38fb10 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs
@@ -45,6 +45,17 @@ 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 7c5928bf6..7ec715a88 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs
@@ -29,6 +29,13 @@ 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 15e9b69d9..40a716c13 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
@@ -45,9 +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;
+                //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