Skip to content

Commit 9ad552f

Browse files
waactonwaacton
committed
Merge branch 'experimental' into 'main'
Add experimental project (LHTSS reflectance curves & Spectral.js) See merge request Wacton/Unicolour!76
2 parents 8c1bf1f + 13d780c commit 9ad552f

File tree

132 files changed

+2699
-1249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+2699
-1249
lines changed

‎Example.Console/Program.cs‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
var inputHex = AnsiConsole.Ask<string>("[dim]Colour hex:[/]");
1818
try
1919
{
20-
var unicolour = new Unicolour(config, inputHex);
21-
var useWhiteText = unicolour.Difference(white, DeltaE.Cie76) > unicolour.Difference(black, DeltaE.Cie76);
22-
AnsiConsole.MarkupLine(GetBar(unicolour, useWhiteText));
23-
AnsiConsole.Write(GetTable(unicolour));
20+
var colour = new Unicolour(config, inputHex);
21+
var useWhiteText = colour.Difference(white, DeltaE.Cie76) > colour.Difference(black, DeltaE.Cie76);
22+
AnsiConsole.MarkupLine(GetBar(colour, useWhiteText));
23+
AnsiConsole.Write(GetTable(colour));
2424
}
2525
catch (Exception e)
2626
{
@@ -30,20 +30,20 @@
3030
Console.WriteLine();
3131
}
3232

33-
string GetBar(Unicolour unicolour, bool useWhiteText)
33+
string GetBar(Unicolour colour, bool useWhiteText)
3434
{
3535
var textHex = useWhiteText ? white.Hex : black.Hex;
36-
var leftSpace = (barLength - unicolour.Description.Length) / 2;
37-
var rightSpace = barLength - unicolour.Description.Length - leftSpace;
36+
var leftSpace = (barLength - colour.Description.Length) / 2;
37+
var rightSpace = barLength - colour.Description.Length - leftSpace;
3838
var leftSpaces = new string(' ', leftSpace);
3939
var rightSpaces = new string(' ', rightSpace);
40-
var text = $"{leftSpaces}{unicolour.Description}{rightSpaces}";
41-
return $"[{textHex} on {unicolour.Hex}]{text}[/]";
40+
var text = $"{leftSpaces}{colour.Description}{rightSpaces}";
41+
return $"[{textHex} on {colour.Hex}]{text}[/]";
4242
}
4343

44-
static Table GetTable(Unicolour unicolour)
44+
static Table GetTable(Unicolour colour)
4545
{
46-
var rgb255 = unicolour.Rgb.Byte255;
46+
var rgb255 = colour.Rgb.Byte255;
4747
var table = new Table
4848
{
4949
Border = TableBorder.Rounded,
@@ -53,44 +53,44 @@ static Table GetTable(Unicolour unicolour)
5353
table.AddColumn(new TableColumn("Space").Width(col1Width));
5454
table.AddColumn(new TableColumn("Value").Width(col2Width));
5555

56-
table.AddRow("Hex", $"{unicolour.Hex}");
57-
table.AddRow("Rgb 255", $"{unicolour.Rgb.Byte255}");
58-
table.AddRow("Rgb", $"{unicolour.Rgb}");
59-
table.AddRow("Rgb Lin.", $"{unicolour.RgbLinear}");
60-
table.AddRow("Hsl", $"{unicolour.Hsl}");
61-
table.AddRow("Hsb", $"{unicolour.Hsb}");
62-
table.AddRow("Hwb", $"{unicolour.Hwb}");
63-
table.AddRow("Hsi", $"{unicolour.Hsi}");
64-
table.AddRow("Xyz", $"{unicolour.Xyz}");
65-
table.AddRow("Xyy", $"{unicolour.Xyy}");
66-
table.AddRow("Wxy", $"{unicolour.Wxy}");
67-
table.AddRow("Lab", $"{unicolour.Lab}");
68-
table.AddRow("Lchab", $"{unicolour.Lchab}");
69-
table.AddRow("Luv", $"{unicolour.Luv}");
70-
table.AddRow("Lchuv", $"{unicolour.Lchuv}");
71-
table.AddRow("Hsluv", $"{unicolour.Hsluv}");
72-
table.AddRow("Hpluv", $"{unicolour.Hpluv}");
73-
table.AddRow("Ypbpr", $"{unicolour.Ypbpr}");
74-
table.AddRow("Ycbcr", $"{unicolour.Ycbcr}");
75-
table.AddRow("Ycgco", $"{unicolour.Ycgco}");
76-
table.AddRow("Yuv", $"{unicolour.Yuv}");
77-
table.AddRow("Yiq", $"{unicolour.Yiq}");
78-
table.AddRow("Ydbdr", $"{unicolour.Ydbdr}");
79-
table.AddRow("Tsl", $"{unicolour.Tsl}");
80-
table.AddRow("Xyb", $"{unicolour.Xyb}");
81-
table.AddRow("Ipt", $"{unicolour.Ipt}");
82-
table.AddRow("Ictcp", $"{unicolour.Ictcp}");
83-
table.AddRow("Jzazbz", $"{unicolour.Jzazbz}");
84-
table.AddRow("Jzczhz", $"{unicolour.Jzczhz}");
85-
table.AddRow("Oklab", $"{unicolour.Oklab}");
86-
table.AddRow("Oklch", $"{unicolour.Oklch}");
87-
table.AddRow("Okhsv", $"{unicolour.Okhsv}");
88-
table.AddRow("Okhsl", $"{unicolour.Okhsl}");
89-
table.AddRow("Okhwb", $"{unicolour.Okhwb}");
90-
table.AddRow("Cam02", $"{unicolour.Cam02}");
91-
table.AddRow("Cam16", $"{unicolour.Cam16}");
92-
table.AddRow("Hct", $"{unicolour.Hct}");
93-
table.AddRow("Icc", $"{unicolour.Icc}");
56+
table.AddRow("Hex", $"{colour.Hex}");
57+
table.AddRow("Rgb 255", $"{colour.Rgb.Byte255}");
58+
table.AddRow("Rgb", $"{colour.Rgb}");
59+
table.AddRow("Rgb Lin.", $"{colour.RgbLinear}");
60+
table.AddRow("Hsl", $"{colour.Hsl}");
61+
table.AddRow("Hsb", $"{colour.Hsb}");
62+
table.AddRow("Hwb", $"{colour.Hwb}");
63+
table.AddRow("Hsi", $"{colour.Hsi}");
64+
table.AddRow("Xyz", $"{colour.Xyz}");
65+
table.AddRow("Xyy", $"{colour.Xyy}");
66+
table.AddRow("Wxy", $"{colour.Wxy}");
67+
table.AddRow("Lab", $"{colour.Lab}");
68+
table.AddRow("Lchab", $"{colour.Lchab}");
69+
table.AddRow("Luv", $"{colour.Luv}");
70+
table.AddRow("Lchuv", $"{colour.Lchuv}");
71+
table.AddRow("Hsluv", $"{colour.Hsluv}");
72+
table.AddRow("Hpluv", $"{colour.Hpluv}");
73+
table.AddRow("Ypbpr", $"{colour.Ypbpr}");
74+
table.AddRow("Ycbcr", $"{colour.Ycbcr}");
75+
table.AddRow("Ycgco", $"{colour.Ycgco}");
76+
table.AddRow("Yuv", $"{colour.Yuv}");
77+
table.AddRow("Yiq", $"{colour.Yiq}");
78+
table.AddRow("Ydbdr", $"{colour.Ydbdr}");
79+
table.AddRow("Tsl", $"{colour.Tsl}");
80+
table.AddRow("Xyb", $"{colour.Xyb}");
81+
table.AddRow("Ipt", $"{colour.Ipt}");
82+
table.AddRow("Ictcp", $"{colour.Ictcp}");
83+
table.AddRow("Jzazbz", $"{colour.Jzazbz}");
84+
table.AddRow("Jzczhz", $"{colour.Jzczhz}");
85+
table.AddRow("Oklab", $"{colour.Oklab}");
86+
table.AddRow("Oklch", $"{colour.Oklch}");
87+
table.AddRow("Okhsv", $"{colour.Okhsv}");
88+
table.AddRow("Okhsl", $"{colour.Okhsl}");
89+
table.AddRow("Okhwb", $"{colour.Okhwb}");
90+
table.AddRow("Cam02", $"{colour.Cam02}");
91+
table.AddRow("Cam16", $"{colour.Cam16}");
92+
table.AddRow("Hct", $"{colour.Hct}");
93+
table.AddRow("Icc", $"{colour.Icc}");
9494
return table;
9595
}
9696

‎Example.Diagrams/Utils.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ internal static List<Marker> GetUvFillMarkers((double min, double max) rangeU, (
124124
}
125125
else
126126
{
127-
var unicolour = new Unicolour(chromaticity);
128-
color = unicolour.IsImaginary ? null : GetScaledColour(unicolour.Rgb);
127+
var colour = new Unicolour(chromaticity);
128+
color = colour.IsImaginary ? null : GetScaledColour(colour.Rgb);
129129
ChromaticityCache.Add(chromaticity, color);
130130
}
131131

‎Example.Gradients/Example.Gradients.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<ItemGroup>
2121
<ProjectReference Include="..\Unicolour.Datasets\Unicolour.Datasets.csproj" />
22+
<ProjectReference Include="..\Unicolour.Experimental\Unicolour.Experimental.csproj" />
2223
<ProjectReference Include="..\Unicolour\Unicolour.csproj" />
2324
</ItemGroup>
2425

0 commit comments

Comments
 (0)