From f315c2a95ee683dfbbb8bf6c70eb772243bd859e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 22 Mar 2021 18:26:24 +0200 Subject: PPC_v1.4.6 --- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 25 ++++++++------------- .../Environment/EnvironmentManager.cs | 8 +++---- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- Software/Visual_Studio/Tango.sln | 16 ++++++------- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 9453b5c13..abc8a3503 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index f15d16b8d..3b7c0698a 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -215,13 +215,11 @@ - - - - + + @@ -491,11 +489,6 @@ - - - - - @@ -505,7 +498,7 @@ - + @@ -573,6 +566,8 @@ + + @@ -776,10 +771,8 @@ - - - - + + diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs index 123c94f7d..8c6c745a9 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs @@ -388,11 +388,11 @@ namespace Tango.AzureUtils.Environment if (config.CopyMachineServiceFiles) { await _ftpManager.CopyAppFiles(sourceApp, targetApp); - } - //Restart slot. - OnProgress(AzureUtilsStage.Environment, "Restarting traget deployment slot..."); - await targetApp.RestartAsync(); + //Restart slot. + OnProgress(AzureUtilsStage.Environment, "Restarting target deployment slot..."); + await targetApp.RestartAsync(); + } OnCompleted("Environment upgraded successfully."); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index e968c2572..596c5ad85 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.4.5.0")] +[assembly: AssemblyVersion("1.4.6.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 3c9c43561..b94961e47 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -551,8 +551,8 @@ Global {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Debug|x64.Build.0 = Debug|Any CPU {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Debug|x86.ActiveCfg = Debug|Any CPU {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Debug|x86.Build.0 = Debug|Any CPU - {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.Build.0 = Release|Any CPU + {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.Build.0 = Debug|Any CPU {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|ARM.ActiveCfg = Release|Any CPU {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|ARM.Build.0 = Release|Any CPU {DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|ARM64.ActiveCfg = Release|Any CPU @@ -4609,12 +4609,12 @@ Global {B356201F-F958-4AC9-BBEB-E4EAE9DA9EC6} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal -- cgit v1.3.1 From 21331aee4e1de2c05561320fbd0c66bd3572beb3 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 22 Mar 2021 18:31:09 +0200 Subject: Machine_Studio_v4.4.4 --- .../Advanced Installer Projects/Machine Studio Installer.aip | 6 +++--- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 5391cac3d..3c5fed026 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -836,7 +836,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index cfa23aa1e..9408391ac 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.4.3.0")] +[assembly: AssemblyVersion("4.4.4.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From d51917f823ca47cc92a3b106dd2607ad1ff1ef8f Mon Sep 17 00:00:00 2001 From: Mirta Date: Thu, 25 Mar 2021 12:52:28 +0200 Subject: Fixed Gamut Region Bug --- .../ColorLib/Tango.ColorLib_v4/ColorConverter.cpp | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp index 9d8715b3a..a606f265e 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp @@ -1375,12 +1375,12 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(InputCoordinates VolumeNoLI(i) = Volume(i); } //Verify Volume is within the allowed limits - - GamutRegion = GetGamutRegion(VolumeNoLI, m_ProcessRangesMaxP); for (int i = 0; i < m_nInks; ++i) // % to nl/cm VolumeNoLI(i) *= (m_maxNlPerCM(i)/100); - GetClosestInk(VolumeNoLI, GamutRegion, VolumeNoLI); + GamutRegion = GetGamutRegion(VolumeNoLI, m_ProcessRangesMaxP); + + GetClosestInk(VolumeNoLI, GamutRegion, VolumeNoLI); //VolumeNoLI is in [%] VolumeToNLInkP(VolumeNoLI, NLInkP); //NLInkP is in % //Limit Inks @@ -1434,7 +1434,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(InputCoordinates //July 29 2020 //Inks are limited in their nonlinear form LimitInks(Ink4Vol, InkOutP); //in [nl/cm] - NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), VolumeNoLI); + NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), VolumeNoLI); //VolumeNoLI in [nl/cm] GamutRegion = GetGamutRegion(VolumeNoLI, m_ProcessRangesMaxP); NLcmtoPercentage(VolumeNoLI, VolumeNoLI); @@ -3978,8 +3978,9 @@ int Tango::ColorLib::ColorConverter::GetGamutRegion(VectorXd Volume, double *Ga int nGR = m_colortable->GetnGamutRegions(); for (int i = 0; i < m_nInks; ++i) { - Volnlcm = m_maxNlPerCM(i)*Volume(i)/100.0; - TotalVolume += Volnlcm; + //Volnlcm = m_maxNlPerCM(i)*Volume(i)/100.0; + //TotalVolume += Volnlcm; + TotalVolume += Volume(i); } for (int i = 0; i < nGR - 1; ++i) { @@ -4149,8 +4150,8 @@ void Tango::ColorLib::ColorConverter::LimitNLInks2Volume(VectorXd NLInks, int &G // NLInks are in the full thread range LimitInks(NLInks, InkOutL); // InkOutL in [nl/cm] NLInkPToVolume(DoubleToVector(InkOutL, m_nInks), Volume); - GamutRegion = GetGamutRegion(Volume, m_ProcessRangesMaxP); - GetClosestInk(Volume, GamutRegion, Volume); + GamutRegion = GetGamutRegion(Volume, m_ProcessRangesMaxP); //Volume in [nl/cm] + GetClosestInk(Volume, GamutRegion, Volume); //Volume is in [%] //NLcmtoPercentage(Volume, Volume); ConfineVolumes(Volume); if (InkOutL != NULL) @@ -4340,7 +4341,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToLabRel(VectorXd &Volume, Ve //Inks are limited in their nonlinear form LimitInks(NLInkP, InkOutP); //InkOutP is in [nl/cm] - NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), Volume); + NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), Volume); //Volume is in [nl/cm] GamutRegion = GetGamutRegion(Volume, m_ProcessRangesMaxP); NLcmtoPercentage(Volume, Volume); //Volume is back to percentage VolumeToNLInkP(Volume, NLInkP); @@ -4747,15 +4748,15 @@ size_t Tango::ColorLib::ColorConverter::GetRecommendedProcessParameters(uint8_t //Assumption: Input is given without light iks //The volumes are given in Thread units in % for (int jV = 0; jV < m_nInks; ++jV) - Volume(jV) = inputcoordinates[istops]->inputliquids[jV]->volume; + Volume(jV) = inputcoordinates[istops]->inputliquids[jV]->volume; //volumes are in [%] if (Input->uselightinks) { //Convert to light inks - SplitVolume(Volume, VolumeLi, GamutRegion[istops]); + SplitVolume(Volume, VolumeLi, GamutRegion[istops]); //VolumeLi is in [%] } else { - GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP); + GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP);//Volume is in [%] } } else if (Input->stops[istops]->colorspace == COLOR_SPACE__Catalog) @@ -4786,11 +4787,11 @@ size_t Tango::ColorLib::ColorConverter::GetRecommendedProcessParameters(uint8_t Volume(jV) =IC->inputliquids[jV]->volume; if (Input->uselightinks) { //Convert to light inks - SplitVolume(Volume, VolumeLi, GamutRegion[istops]); + SplitVolume(Volume, VolumeLi, GamutRegion[istops]); //VolumeLi is in [%] } else { - GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP); + GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP); //Volume is in [%] } } else @@ -4805,10 +4806,10 @@ size_t Tango::ColorLib::ColorConverter::GetRecommendedProcessParameters(uint8_t if (m_CalibMode == 1) { ConvertToNLInks(InkOut, NLInkOut); - LimitNLInks2Volume(NLInkOut, GamutRegion[istops], Volume); + LimitNLInks2Volume(NLInkOut, GamutRegion[istops], Volume); //Volume is in [%] } else - LimitNLInks2Volume(InkOut, GamutRegion[istops], Volume); + LimitNLInks2Volume(InkOut, GamutRegion[istops], Volume); //Volume is in [%] if (Input->uselightinks) { //Convert to light inks -- cgit v1.3.1 From 2c359476f7837fc298120d80b20d5d48377658fd Mon Sep 17 00:00:00 2001 From: Mirta Date: Mon, 5 Apr 2021 18:05:59 +0300 Subject: Fixed Gradient Input and Test --- .../ColorLib/Tango.ColorLib_v4/ColorConverter.cpp | 45 +++- .../ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp | 2 +- .../Tango.ColorLib.GradientTest.CLI/Program.cs | 265 +++++++++++---------- 3 files changed, 178 insertions(+), 134 deletions(-) diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp index a606f265e..1f0978364 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp @@ -3103,7 +3103,7 @@ void Tango::ColorLib::ColorConverter::findStops(Gradient &GradStop1, Gradient &G nOut = indGrad + 1; else { - throw std::exception("Number of subdivisions exceed allocation"); + throw std::exception("Number of subdivisions exceeds allocation"); if (VecLabOut_tmp != NULL) { delete[] VecLabOut_tmp; @@ -3432,7 +3432,7 @@ void Tango::ColorLib::ColorConverter::PrepareGradient(GradientConversionInput* c //m_nVolumes = m_nB2AnSepOut; int GamutRegion = 0; - for (int i = 0; i < m_nGradStops; ++i) +/* for (int i = 0; i < m_nGradStops; ++i) { inputcoordinates[i]->n_inputliquids = m_nInks; inputcoordinates[i]->inputliquids = (InputLiquid**)malloc(sizeof(InputLiquid*) *m_nInks); @@ -3441,7 +3441,7 @@ void Tango::ColorLib::ColorConverter::PrepareGradient(GradientConversionInput* c inputcoordinates[i]->inputliquids[j] = (InputLiquid*)malloc(sizeof(InputLiquid)); input_liquid__init(inputcoordinates[i]->inputliquids[j]); } - } + }*/ ProcessGradientStops(inputcoordinates); //are all stops in the same region? @@ -3761,16 +3761,34 @@ void Tango::ColorLib::ColorConverter::GradInput2InputCoords(GradientConversionI inputcoordinates[i]->has_b = true; break; case COLOR_SPACE__Catalog: - inputcoordinates[i]->cyan = conversionInput->stops[i]->cyan; - inputcoordinates[i]->magenta = conversionInput->stops[i]->magenta; - inputcoordinates[i]->yellow = conversionInput->stops[i]->yellow; - inputcoordinates[i]->key = conversionInput->stops[i]->key; - inputcoordinates[i]->has_cyan = conversionInput->stops[i]->has_cyan; - inputcoordinates[i]->has_magenta = conversionInput->stops[i]->has_magenta; - inputcoordinates[i]->has_yellow = conversionInput->stops[i]->has_yellow; - inputcoordinates[i]->has_key = conversionInput->stops[i]->has_key; + { + InputLiquid** InputLiquidsIC = (InputLiquid**)malloc(sizeof(InputLiquid*) *m_TotalNumberofInks); + for (int j = 0; j < m_TotalNumberofInks; j++) + { + InputLiquidsIC[j] = (InputLiquid*)malloc(sizeof(InputLiquid)); + input_liquid__init(InputLiquidsIC[j]); + } + + /*LiquidVolume* liquidVolume = conversionInput->stops[i]->liquidvolumes[j];*/ + GradientInputStop *ColorStop = conversionInput->stops[i]; + InputLiquidsIC[0]->volume = ColorStop->cyan; + InputLiquidsIC[0]->liquidtype = LIQUID_TYPE__Cyan; + + InputLiquidsIC[1]->volume = ColorStop->magenta; + InputLiquidsIC[1]->liquidtype = LIQUID_TYPE__Magenta; + + InputLiquidsIC[2]->volume = ColorStop->yellow; + InputLiquidsIC[2]->liquidtype = LIQUID_TYPE__Yellow; + + InputLiquidsIC[3]->volume = ColorStop->key; + InputLiquidsIC[3]->liquidtype = LIQUID_TYPE__Black; + + inputcoordinates[i]->inputliquids = InputLiquidsIC; + inputcoordinates[i]->n_inputliquids = m_TotalNumberofInks; break; + } case COLOR_SPACE__Volume: //Case Volume + { //int size= (int)conversionInput->stops[i]->n_liquidvolumes; InputLiquid** InputLiquidsIC = (InputLiquid**)malloc(sizeof(InputLiquid*) *m_TotalNumberofInks); for (int j = 0; j < m_TotalNumberofInks; j++) @@ -3807,6 +3825,7 @@ void Tango::ColorLib::ColorConverter::GradInput2InputCoords(GradientConversionI inputcoordinates[i]->n_inputliquids = m_TotalNumberofInks; break; } + } } } @@ -4027,7 +4046,7 @@ void Tango::ColorLib::ColorConverter::ProcessGradientStops(InputCoordinates **in if (m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Volume || m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Catalog) { //Convert volume to Lab //Convert lab to rgb - if (m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Catalog) + /*if (m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Catalog) { inputcoordinates[i]->inputliquids[0]->volume = inputcoordinates[i]->cyan; inputcoordinates[i]->inputliquids[1]->volume = inputcoordinates[i]->magenta; @@ -4035,7 +4054,7 @@ void Tango::ColorLib::ColorConverter::ProcessGradientStops(InputCoordinates **in inputcoordinates[i]->inputliquids[3]->volume = inputcoordinates[i]->key; for (int i_hv =0; i_hv<4; ++i_hv) inputcoordinates[i]->inputliquids[i_hv]->has_volume = true; - } + }*/ ConvertVolumeToRGBDisplay(inputcoordinates[i], m_nProcessRanges, m_GradStops[i].Get_ColorSpace(), Volume, RGBOut, LabOut, GamutRegion); VectorToDouble(LabOut, LabOutV); diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp index 63a93de54..c2878d156 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp @@ -41,5 +41,5 @@ void Gradient::SetVolumeValue(double val, int ind) void Gradient::SetCatalogInkValues(double val, int ind) { - + m_Volume[ind] = val; } diff --git a/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs b/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs index 75746c7bc..576592c66 100644 --- a/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs +++ b/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs @@ -774,81 +774,93 @@ namespace Tango.ColorLib.GradientTest.CLI { ColorSpace = ColorSpace.Catalog, Offset = 0.0, + Cyan = 50.0, + Magenta = 50.0, + Yellow = 0.0, + Key = 0.0, }; - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Cyan, - Volume = 50 - }); - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Magenta, - Volume = 50 - }); - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Yellow, - Volume = 0 - }); - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Black, - Volume = 0 - }); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Cyan, + // Volume = 50 + //}); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Magenta, + // Volume = 50 + //}); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Yellow, + // Volume = 0 + //}); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Black, + // Volume = 0 + //}); input.Stops.Add(gradientInputStop1); GradientInputStop gradientInputStop2 = new GradientInputStop() { ColorSpace = ColorSpace.Catalog, Offset = 0.5, + Cyan = 0.0, + Magenta = 50.0, + Yellow = 50.0, + Key = 0.0, }; - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Cyan, - Volume = 0 - }); - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Magenta, - Volume = 50 - }); - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Yellow, - Volume = 50 - }); - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Black, - Volume = 0 - }); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Cyan, + // Volume = 0 + //}); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Magenta, + // Volume = 50 + //}); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Yellow, + // Volume = 50 + //}); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Black, + // Volume = 0 + //}); input.Stops.Add(gradientInputStop2); GradientInputStop gradientInputStop3 = new GradientInputStop() { ColorSpace = ColorSpace.Catalog, Offset = 1, + Cyan = 50.0, + Magenta = 50.0, + Yellow = 0.0, + Key = 0.0, }; - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Cyan, - Volume = 50 - }); - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Magenta, - Volume = 0 - }); - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Yellow, - Volume = 50 - }); - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Black, - Volume = 0 - }); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Cyan, + // Volume = 50 + //}); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Magenta, + // Volume = 0 + //}); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Yellow, + // Volume = 50 + //}); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Black, + // Volume = 0 + //}); input.Stops.Add(gradientInputStop3); Console.WriteLine($"TestCatalogGamutRegion0 input:\n{input.ToJsonString(nameof(input.ForwardData), nameof(CalibrationData))}"); @@ -874,27 +886,31 @@ namespace Tango.ColorLib.GradientTest.CLI { ColorSpace = ColorSpace.Catalog, Offset = 0.0, + Cyan = 100.0, + Magenta = 50.0, + Yellow = 0.0, + Key = 0.0, }; - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Cyan, - Volume = 100 - }); - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Magenta, - Volume = 50 - }); - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Yellow, - Volume = 0 - }); - gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Black, - Volume = 0 - }); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Cyan, + // Volume = 100 + //}); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Magenta, + // Volume = 50 + //}); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Yellow, + // Volume = 0 + //}); + //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Black, + // Volume = 0 + //}); input.Stops.Add(gradientInputStop1); //Volume, Gamut Region 1, In Gamut @@ -902,54 +918,63 @@ namespace Tango.ColorLib.GradientTest.CLI { ColorSpace = ColorSpace.Catalog, Offset = 0.5, + Cyan = 100.0, + Magenta = 50.0, + Yellow = 0.0, + Key = 0.0, }; - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Cyan, - Volume = 0 - }); - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Magenta, - Volume = 100 - }); - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Yellow, - Volume = 50 - }); - gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Black, - Volume = 0 - }); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Cyan, + // Volume = 100 + //}); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Magenta, + // Volume = 50 + //}); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Yellow, + // Volume = 0 + //}); + //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Black, + // Volume = 0 + //}); input.Stops.Add(gradientInputStop2); GradientInputStop gradientInputStop3 = new GradientInputStop() { ColorSpace = ColorSpace.Catalog, Offset = 1, + Cyan = 50.0, + Magenta = 0.0, + Yellow = 100.0, + Key = 0.0, }; - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Cyan, - Volume = 50 - }); - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Magenta, - Volume = 0 - }); - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Yellow, - Volume = 100 - }); - gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() - { - LiquidType = LiquidType.Black, - Volume = 0 - }); + + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Cyan, + // Volume = 50 + //}); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Magenta, + // Volume = 0 + //}); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Yellow, + // Volume = 100 + //}); + //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume() + //{ + // LiquidType = LiquidType.Black, + // Volume = 0 + //}); input.Stops.Add(gradientInputStop3); Console.WriteLine($"TestCatalogGamutRegion1 input:\n{input.ToJsonString(nameof(input.ForwardData), nameof(CalibrationData))}"); -- cgit v1.3.1