diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-06-30 10:05:18 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-06-30 10:05:18 +0300 |
| commit | 74a17c16836a23edc6f0c4b4027a85cf04a63a86 (patch) | |
| tree | ba7f8a66ee765407fcaea646ebae8e5669f72acf | |
| parent | d100f0eab0fa25c861cbae2ced60afc5dfa8da6b (diff) | |
| download | Tango-74a17c16836a23edc6f0c4b4027a85cf04a63a86.tar.gz Tango-74a17c16836a23edc6f0c4b4027a85cf04a63a86.zip | |
Fixed color conversion calibration error.
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs | 30 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs | 24 |
2 files changed, 36 insertions, 18 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; diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs index c801d51fc..9c92fac36 100644 --- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs +++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs @@ -511,7 +511,11 @@ namespace Tango.ColorConversion if (rml_cat != null) { - calibrationData = rml_cat.GetCalibrationData(); + var data = rml_cat.GetCalibrationData(); + if (data.CalibrationPoints.Count > 0) + { + calibrationData = data; + } } //} @@ -725,7 +729,11 @@ namespace Tango.ColorConversion if (rml_cat != null) { - calibrationData = rml_cat.GetCalibrationData(); + var data = rml_cat.GetCalibrationData(); + if (data.CalibrationPoints.Count > 0) + { + calibrationData = data; + } } input.InputCoordinates.InputLiquids.Add(new InputLiquid() @@ -911,7 +919,11 @@ namespace Tango.ColorConversion if (rml_cat != null) { - calibrationData = rml_cat.GetCalibrationData(); + var data = rml_cat.GetCalibrationData(); + if (data.CalibrationPoints.Count > 0) + { + calibrationData = data; + } } input.InputLiquids.Add(new InputLiquid() @@ -1180,7 +1192,11 @@ namespace Tango.ColorConversion if (rml_cat != null) { - calibrationData = rml_cat.GetCalibrationData(); + var data = rml_cat.GetCalibrationData(); + if (data.CalibrationPoints.Count > 0) + { + calibrationData = data; + } } //} |