diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs | 30 |
1 files changed, 16 insertions, 14 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 00bae4835..69fcfee3d 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 @@ -251,21 +251,16 @@ namespace Tango.MachineStudio.RML.ViewModels //Validate calibration data foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment && !x.LiquidType.IsExtraInk)) { - if (vm.CalibrationPoints.Count == 0) + if (vm.CalibrationPoints.Count > 0) { - InvokeUI(() => + if (!(vm.CalibrationPoints.First().X == 0 && vm.CalibrationPoints.First().Y == 0 && vm.CalibrationPoints.Last().X >= 100 && vm.CalibrationPoints.Last().Y >= 100)) { - _notification.ShowError($"No calibration data for liquid '{vm.LiquidType.Name}'. Could not convert source color."); - }); - return; - } - else if (!(vm.CalibrationPoints.First().X == 0 && vm.CalibrationPoints.First().Y == 0 && vm.CalibrationPoints.Last().X >= 100 && vm.CalibrationPoints.Last().Y >= 100)) - { - InvokeUI(() => - { - _notification.ShowError($"Invalid calibration data for liquid '{vm.LiquidType.Name}'. Could not convert source color."); - }); - return; + InvokeUI(() => + { + _notification.ShowError($"Invalid calibration data for liquid '{vm.LiquidType.Name}'. Could not convert source color."); + }); + return; + } } } @@ -276,7 +271,14 @@ namespace Tango.MachineStudio.RML.ViewModels CalibrationData calData = new CalibrationData(); calData.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code; - calData.CalibrationPoints.AddRange(vm.CalibrationPoints.Select(x => new CalibrationPoint() { X = x.X, Y = x.Y })); + if (vm.CalibrationPoints.Count > 0) + { + calData.CalibrationPoints.AddRange(vm.CalibrationPoints.Select(x => new CalibrationPoint() { X = x.X, Y = x.Y })); + } + else + { + calData.CalibrationPoints.AddRange(Cat.CreateDemoCalibrationData(calData.LiquidType).CalibrationPoints); + } inputLiquid.CalibrationData = calData; |