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

1 files changed, 14 insertions, 1 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 b68239b4b..f583fa15e 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
@@ -309,6 +309,19 @@ namespace Tango.MachineStudio.RML.ViewModels
             }
         }
 
+        private double GetTotalMaximumLiquidVolumeLimit()
+        {
+            try
+            {
+                var tables = RML.GetActiveProcessGroup().ProcessParametersTables.OrderBy(x => x.TableIndex).ToList();
+                return (tables[1].MaxInkUptake / tables[0].MaxInkUptake) * 100;
+            }
+            catch
+            {
+                return BrushStop.MAX_TOTAL_LIQUID_VOLUME;
+            }
+        }
+
         private void OnLiquidVolumeChanged()
         {
             try
@@ -316,7 +329,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) > 200)
+                if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.Volume) > GetTotalMaximumLiquidVolumeLimit())
                 {
                     IsVolumesOutOfRange = true;
                     return;