Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 16 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
index d9ba419e0..95de19f42 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
@@ -111,6 +111,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 Color = x.LiquidType.Color,
                 Name = x.LiquidType.Name,
                 LiquidType = x.LiquidType,
+                MaxNanoliterPerCentimeter = x.MaxNlPerCm,
             }).ToObservableCollection();
         }
 
@@ -309,7 +310,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             }
         }
 
-        private double GetTotalMaximumLiquidVolumeLimit()
+        private double GetTotalMaximumLiquidNlPerCMLimit()
         {
             try
             {
@@ -329,7 +330,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 if (LiquidsCalibrationData == null || _prevent_inverse_conversion) return;
 
                 //TODO: This is temporary because of out of range volumes.
-                if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.Volume) > GetTotalMaximumLiquidVolumeLimit())
+                if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.NanoliterPerCentimeter) > GetTotalMaximumLiquidNlPerCMLimit())
                 {
                     IsVolumesOutOfRange = true;
                     return;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
index 7399d62af..27b811bb6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Dispensing;
 using Tango.BL.Entities;
 using Tango.Core;
 using Tango.SharedUI;
@@ -47,5 +48,17 @@ namespace Tango.MachineStudio.RML.ViewModels
             get { return _liquidType; }
             set { _liquidType = value; RaisePropertyChangedAuto(); }
         }
+
+        public double MaxNanoliterPerCentimeter { get; set; }
+
+        public double NanoliterPerCentimeter
+        {
+            get
+            {
+                StandardColorDispensingCalc calc = new StandardColorDispensingCalc();
+                return calc.CalculateNanoliterPerCentimeter(Volume, MaxNanoliterPerCentimeter);
+            }
+        }
+
     }
 }