intercal/colorhash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split up palettes into multicolor/gradient

Browse Source 
Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
This commit is contained in:
Alek Ratzloff
2024-05-24 22:30:42 -07:00
parent 0baf1f7688
commit 9298d72c17
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
colorhash/__main__.py
View File

@@ -170,7 +170,7 @@ def main() -> None:
# Choose the palette # Choose the palette
palette: list[str] palette: list[str]
if args.palette == "auto": if args.palette == "auto":
palette = matricizer.choose_palette(hashdata, PALETTES) palette = matricizer.choose_palette(hashdata)
else: else:
palette = PALETTES[args.palette] palette = PALETTES[args.palette]

25
colorhash/matricizer.py
View File

@@ -2,7 +2,7 @@
import abc import abc
from typing import Mapping, Sequence from typing import Mapping, Sequence
from .palettes import Palette, DEFAULT_PALETTES from .palettes import Palette, DEFAULT_PALETTES, GRADIENT_PALETTES, MULTICOLOR_PALETTES
Matrix = Sequence[Sequence[int]] Matrix = Sequence[Sequence[int]]
@@ -35,11 +35,18 @@ class Matricizer(metaclass=abc.ABCMeta):
:returns: the matrix converted from the hash data. :returns: the matrix converted from the hash data.
""" """
@abc.abstractmethod def choose_palette(
def choose_palette(self, data: bytes, palettes: Mapping[str, Palette]) -> Palette: self, data: bytes, palettes: Mapping[str, Palette] | None = None
) -> Palette:
""" """
Choose a palette based on the give data and palettes. Choose a palette based on the give data and palettes.
By default, this method will choose the Nth palette from the sum of the data mod the length
of all palettes provided (using all palettes as the default).
""" """
if palettes is None:
palettes = DEFAULT_PALETTES
return list(palettes.values())[sum(data) % len(palettes)]
class NibbleMatricizer(Matricizer): class NibbleMatricizer(Matricizer):
@@ -89,8 +96,10 @@ class NibbleMatricizer(Matricizer):
return cols return cols
def choose_palette(self, data: bytes, palettes: Mapping[str, Palette]) -> Palette: def choose_palette(
return list(palettes.values())[sum(data) % len(palettes)] self, data: bytes, palettes: Mapping[str, Palette] | None = None
) -> Palette:
return super().choose_palette(data, palettes or GRADIENT_PALETTES)
class RandomartMatricizer(Matricizer): class RandomartMatricizer(Matricizer):
@@ -139,5 +148,7 @@ class RandomartMatricizer(Matricizer):
rows[r][c] += 1 rows[r][c] += 1
return rows return rows
def choose_palette(self, _data: bytes, _palettes: Mapping[str, Palette]) -> Palette: def choose_palette(
return DEFAULT_PALETTES['rainbow'] self, data: bytes, palettes: Mapping[str, Palette] | None = None
) -> Palette:
return super().choose_palette(data, palettes or MULTICOLOR_PALETTES)

9
colorhash/palettes.py
View File

@@ -87,7 +87,7 @@ def hsl_colors(hue: HSVRange, sat: HSVRange, light: HSVRange) -> list[str]:
return [f"hsl({h:.02f},{s:.02f}%,{l:.02f}%)" for h, s, l in zip(hue, sat, light)] return [f"hsl({h:.02f},{s:.02f}%,{l:.02f}%)" for h, s, l in zip(hue, sat, light)]
DEFAULT_PALETTES = { GRADIENT_PALETTES = {
# Interesting thing with human perception. # Interesting thing with human perception.
# Between red and yellow, we can perceive "orange". We have a name for it and see it as a # Between red and yellow, we can perceive "orange". We have a name for it and see it as a
# distinct color. However, between yellow and green, we see a sickly green; between green and # distinct color. However, between yellow and green, we see a sickly green; between green and
@@ -143,9 +143,16 @@ DEFAULT_PALETTES = {
"gray-light": StaticPalette(hsl_colors(0, 0, range(50, 100))), "gray-light": StaticPalette(hsl_colors(0, 0, range(50, 100))),
"gray-dark": StaticPalette(hsl_colors(0, 0, range(0, 50))), "gray-dark": StaticPalette(hsl_colors(0, 0, range(0, 50))),
}
MULTICOLOR_PALETTES = {
"rainbow": StaticPalette(hsl_colors(range(0, 360), 100, 50)), "rainbow": StaticPalette(hsl_colors(range(0, 360), 100, 50)),
} }
DEFAULT_PALETTES = {
**GRADIENT_PALETTES, **MULTICOLOR_PALETTES,
}
PALETTES = {**DEFAULT_PALETTES} PALETTES = {**DEFAULT_PALETTES}