From 6768f10da035dee02e5f4de2988b7cdccd7dc04c Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 7 Aug 2022 17:49:02 +0300 Subject: Fine Tuning. LAB out of gamut. --- .../Tango.PPC.JobsV2/Models/BrushStopModel.cs | 37 ++++++++++++++++++++++ .../Tango.PPC.JobsV2/Models/TrialsLogModel.cs | 3 -- 2 files changed, 37 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs index 07bf2fa5c..e71edc7a7 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs @@ -1397,6 +1397,43 @@ namespace Tango.PPC.Jobs.Models } } + public void FineTuningConverter() + { + RequiredMaxLiquidTest = true; + + ColorSpaces colorSpace = ColorSpaces.LAB; + BrushStop stop = CreateBrushStop(colorSpace); + try + { + IsBusy = true; + var output = _converter.Convert(stop, SegmentModel.Job.Machine.Configuration, SegmentModel.Job.Rml, false, false, false); + + _cyan = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Cyan).Volume); + _yellow = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Yellow).Volume); + _magenta = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Magenta).Volume); + _black = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Black).Volume); + IsOutOfGamut = output.OutOfGamut; + if(IsOutOfGamut) + { + BrushStop stopLAB = CreateBrushStop(ColorSpaces.Volume); + + IsBusy = true; + var outputLAB = _converter.Convert(stopLAB, SegmentModel.Job.Machine.Configuration, SegmentModel.Job.Rml, false, false, false); + _l = output.SingleCoordinates.L; + _a = output.SingleCoordinates.A; + _b = output.SingleCoordinates.B; + } + } + catch (Exception ex) + { + LogManager.Log(ex, "An error occurred while trying to get volume => RGB from conversion engine." + ex); + } + finally + { + IsBusy = false; + } + } + public void RaiseOffsetChanged() { RaisePropertyChanged(nameof(OffsetPercent)); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs index 3b16a65a2..c6dfdd4a9 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs @@ -64,8 +64,6 @@ namespace Tango.PPC.Jobs.Models public double SuggestionA { get; set; } [BsonIgnore] public double SuggestionB { get; set; } - [BsonIgnore] - public bool HasSuggestionsLAB { get; set; } public double C { get; set; } public double M { get; set; } @@ -195,7 +193,6 @@ namespace Tango.PPC.Jobs.Models IsTested = false; IsSelectionEnable = true; IsBest = false; - HasSuggestionsLAB = false; } #region Methods -- cgit v1.3.1