aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio
diff options
context:
space:
mode:
authorRoy <Roy.mail.net@gmail.com>2022-11-02 12:07:54 +0200
committerRoy <Roy.mail.net@gmail.com>2022-11-02 12:07:54 +0200
commita0aa076f3833585d59df618ed532b414bd9f1998 (patch)
tree419e4e59dfe82cec191613bed899023ef9967049 /Software/Visual_Studio/MachineStudio
parent2b74a22cc1327bffa3857171710c2a91f500b462 (diff)
parent3a40ac732c23b4cba912c542f3d71c58a8943e8a (diff)
downloadTango-a0aa076f3833585d59df618ed532b414bd9f1998.tar.gz
Tango-a0aa076f3833585d59df618ed532b414bd9f1998.zip
Merged ColorLib 6
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 6da1cf64b..44ba71ac0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -1110,6 +1110,18 @@ namespace Tango.MachineStudio.RML.ViewModels
input.UseLightInks = ActiveRML.UseLightInks;
input.VMax = ActiveRML.VMax;
+ if (SelectedGBD != null)
+ {
+ input.GbdData = ByteString.CopyFrom(SelectedGBD.Data);
+ }
+
+ if (SelectedLUB != null)
+ {
+ input.LubData = ByteString.CopyFrom(SelectedLUB.Data);
+ }
+
+ input.UseLubricantTransform = ActiveRML.UseLubricantTransform;
+
//Validate calibration data
foreach (var vm in CalibrationDataViewVM.LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
{