aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels
diff options
context:
space:
mode:
authorMirta <mirta@twine-s.com>2021-02-03 10:45:49 +0200
committerMirta <mirta@twine-s.com>2021-02-03 10:45:49 +0200
commitf2f083789efa972642dd51d08b8e8aa44de8c819 (patch)
treea0aa1cb05b1c281a5bc85c30ae74e391150007e1 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels
parentaa151f5fdf47dc02c77bb4ef46164e43aaba872d (diff)
parent0a1203a500d309ff2a2a20e5643d3f85c7c6d3a9 (diff)
downloadTango-f2f083789efa972642dd51d08b8e8aa44de8c819.tar.gz
Tango-f2f083789efa972642dd51d08b8e8aa44de8c819.zip
Merged Vika's changes with Mirta's Changes
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs3
1 files changed, 3 insertions, 0 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 4a6fd7d36..6ba539078 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
@@ -353,6 +353,9 @@ namespace Tango.MachineStudio.RML.ViewModels
input.ThreadA = RML.WhitePointA;
input.ThreadB = RML.WhitePointB;
+ input.UseLightInks = RML.UseLightInks;
+ input.VMax = RML.VMax;
+
foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
{
InputLiquid inputLiquid = new InputLiquid();