diff --git a/Example.Console/Example.Console.csproj b/Example.Console/Example.Console.csproj index 5a6f4450..705d16f0 100644 --- a/Example.Console/Example.Console.csproj +++ b/Example.Console/Example.Console.csproj @@ -22,4 +22,10 @@ + + + Always + + + diff --git a/Example.Console/Program.cs b/Example.Console/Program.cs index a3c5f80b..dc14a772 100644 --- a/Example.Console/Program.cs +++ b/Example.Console/Program.cs @@ -1,11 +1,14 @@ using Spectre.Console; using Wacton.Unicolour; +using Wacton.Unicolour.Icc; + +var config = new Configuration(iccConfiguration: new("SWOP2006_Coated5v2.icc", Intent.RelativeColorimetric, "SWOP2006")); var white = new Unicolour("#000000"); var black = new Unicolour("#FFFFFF"); const int col1Width = 8; -const int col2Width = 24; +const int col2Width = 32; const int barLength = col1Width + 2 + col2Width + 2 + 3; // 2 per column padding, 3 for all borders while (true) @@ -14,7 +17,7 @@ var inputHex = AnsiConsole.Ask("[dim]Colour hex:[/]"); try { - var unicolour = new Unicolour(inputHex); + var unicolour = new Unicolour(config, inputHex); var useWhiteText = unicolour.Difference(white, DeltaE.Cie76) > unicolour.Difference(black, DeltaE.Cie76); AnsiConsole.MarkupLine(GetBar(unicolour, useWhiteText)); AnsiConsole.Write(GetTable(unicolour)); @@ -87,6 +90,7 @@ static Table GetTable(Unicolour unicolour) table.AddRow("Cam02", $"{unicolour.Cam02}"); table.AddRow("Cam16", $"{unicolour.Cam16}"); table.AddRow("Hct", $"{unicolour.Hct}"); + table.AddRow("Icc", $"{unicolour.Icc}"); return table; } diff --git a/Example.Console/SWOP2006_Coated5v2.icc b/Example.Console/SWOP2006_Coated5v2.icc new file mode 100644 index 00000000..9797a13f Binary files /dev/null and b/Example.Console/SWOP2006_Coated5v2.icc differ diff --git a/Example.Console/ThirdPartyNotices/SWOP2006_Coated5v2 b/Example.Console/ThirdPartyNotices/SWOP2006_Coated5v2 new file mode 100644 index 00000000..02b55754 --- /dev/null +++ b/Example.Console/ThirdPartyNotices/SWOP2006_Coated5v2 @@ -0,0 +1 @@ +Copyright X-Rite, Inc. This profile is made available by IDEAlliance, with permission of X-Rite, Inc., and may be used, embedded, exchanged, and shared without restriction. It may not be altered, or sold without written permission of IDEAlliance. \ No newline at end of file diff --git a/Unicolour.Datasets/Unicolour.Datasets.csproj b/Unicolour.Datasets/Unicolour.Datasets.csproj index 077ad8da..db7bfa57 100644 --- a/Unicolour.Datasets/Unicolour.Datasets.csproj +++ b/Unicolour.Datasets/Unicolour.Datasets.csproj @@ -8,7 +8,7 @@ Wacton.Unicolour.Datasets 10 true - 2.2.0 + 2.3.0 William Acton Datasets for use with 🌈 Wacton.Unicolour William Acton diff --git a/Unicolour.Readme/docs/console-info.png b/Unicolour.Readme/docs/console-info.png index d6e410ea..20eb16c6 100644 Binary files a/Unicolour.Readme/docs/console-info.png and b/Unicolour.Readme/docs/console-info.png differ diff --git a/Unicolour/Unicolour.csproj b/Unicolour/Unicolour.csproj index 8f8ccf62..c65091f8 100644 --- a/Unicolour/Unicolour.csproj +++ b/Unicolour/Unicolour.csproj @@ -15,7 +15,7 @@ netstandard2.0 True Resources\Unicolour.png - 4.5.0 + 4.6.0 colour color RGB HSB HSV HSL HWB HSI XYZ xyY WXY LAB LUV LCH LCHab LCHuv HSLuv HPLuv YPbPr YCbCr YCgCo YUV YIQ YDbDr TSL XYB IPT ICtCp JzAzBz JzCzHz Oklab Oklch Okhsv Okhsl Okhwb CAM02 CAM16 HCT ICC icc-profile CMYK CMYKOGV converter colour-converter colour-conversion color-converter color-conversion colour-space colour-spaces color-space color-spaces interpolation colour-interpolation color-interpolation colour-mixing color-mixing comparison colour-comparison color-comparison contrast luminance deltaE chromaticity display-p3 rec-2020 rec-601 rec-709 A98 ProPhoto ACES ACEScg ACEScct ACEScc xvYCC PAL NTSC SECAM gamut-mapping temperature cct duv cvd colour-vision-deficiency color-vision-deficiency colour-blindness color-blindness protanopia deuteranopia tritanopia achromatopsia spd dominant-wavelength excitation-purity imaginary-color imaginary-colour Add ICC profile support (v2, Output device, LAB PCS) Resources\Unicolour.ico diff --git a/docs/console-info.png b/docs/console-info.png index d6e410ea..20eb16c6 100644 Binary files a/docs/console-info.png and b/docs/console-info.png differ