diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-12-05 02:42:52 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-12-05 02:42:52 +0200 |
| commit | 92de61904c6ae3f8455827944b4aa62c5582bbb5 (patch) | |
| tree | d02f1ce1294b93400d7732356d54edf24766af17 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels | |
| parent | 84708ec080fb94ccf637ac623967fd0e538c1fb5 (diff) | |
| parent | b77fbb01ed5b63b65f6e755fef9ca49c3e58ea50 (diff) | |
| download | Tango-92de61904c6ae3f8455827944b4aa62c5582bbb5.tar.gz Tango-92de61904c6ae3f8455827944b4aa62c5582bbb5.zip | |
Merged Extra Inks to Software.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels')
2 files changed, 6 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 ca3c3e322..b9e2ebf5d 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 @@ -282,6 +282,8 @@ namespace Tango.MachineStudio.RML.ViewModels inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code; inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.LiquidType.Code).MaxNlPerCm; + inputLiquid.IsExtraInk = vm.LiquidType.IsExtraInk; + inputLiquid.Color = vm.LiquidType.Color; input.InputCoordinates.InputLiquids.Add(inputLiquid); } @@ -400,6 +402,8 @@ namespace Tango.MachineStudio.RML.ViewModels inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code; inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.LiquidType.Code).MaxNlPerCm; inputLiquid.Volume = LiquidVolumes.SingleOrDefault(x => x.LiquidType == vm.LiquidType).Volume; + inputLiquid.IsExtraInk = vm.LiquidType.IsExtraInk; + inputLiquid.Color = vm.LiquidType.Color; input.InputCoordinates.InputLiquids.Add(inputLiquid); } 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 e3c128cb7..0962cd4d1 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 @@ -348,9 +348,9 @@ namespace Tango.MachineStudio.RML.ViewModels BatchConversionCommand = new RelayCommand(BatchConversion); } - public override void OnApplicationReady() + public override async void OnApplicationReady() { - + } private async Task LoadRmls() |