aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-02 15:48:14 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-02 15:48:14 +0300
commit10861ebf4891d02894a9cf6e8f94354067663765 (patch)
tree55f742b23e9d3360ee4e54822042d13d4c2c164d /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
parent8c9286c40dff0918f90d5813ba1c3676a95c4e84 (diff)
downloadTango-10861ebf4891d02894a9cf6e8f94354067663765.tar.gz
Tango-10861ebf4891d02894a9cf6e8f94354067663765.zip
Fixed volumes out of range on RML module color conversion test.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs13
1 files changed, 13 insertions, 0 deletions
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);
+ }
+ }
+
}
}