🔀 Merge pull request #9 from davep/more-colour

Add a couple more colour options

Author: davep

ChangeLog.md

@@ -1,5 +1,12 @@
 # Complexitty ChangeLog
 
+## v0.4.0
+
+**Released: WiP**
+
+- Added a couple more colour options.
+  ([#9](https://github.com/davep/complexitty/pull/9))
+
 ## v0.2.0
 
 **Released: 2025-04-22**

src/complexitty/commands/__init__.py

@@ -4,7 +4,9 @@
 # Local imports.
 from .colouring import (
     SetColourToBluesAndBrowns,
+    SetColourToBluesAndPinks,
     SetColourToDefault,
+    SetColourToRainbow,
     SetColourToShadesOfBlue,
     SetColourToShadesOfGreen,
     SetColourToShadesOfRed,
@@ -59,7 +61,9 @@
     "Quit",
     "Reset",
     "SetColourToBluesAndBrowns",
+    "SetColourToBluesAndPinks",
     "SetColourToDefault",
+    "SetColourToRainbow",
     "SetColourToShadesOfBlue",
     "SetColourToShadesOfGreen",
     "SetColourToShadesOfRed",

src/complexitty/commands/colouring.py

@@ -45,4 +45,20 @@ class SetColourToShadesOfBlue(Command):
     ACTION = "set_colour('shades_of_blue')"
 
 
+##############################################################################
+class SetColourToBluesAndPinks(Command):
+    """Set the colours to a blue/pink palette"""
+
+    BINDING_KEY = "6"
+    ACTION = "set_colour('blues_and_pinks')"
+
+
+##############################################################################
+class SetColourToRainbow(Command):
+    """Set the colours to a rainbow palette"""
+
+    BINDING_KEY = "7"
+    ACTION = "set_colour('rainbow')"
+
+
 ### colouring.py ends here

src/complexitty/mandelbrot/colouring.py

@@ -7,15 +7,15 @@
 
 ##############################################################################
 # Textual imports.
-from textual.color import Color
+from textual.color import Color, Gradient
 
 ##############################################################################
 ColourMap: TypeAlias = Callable[[int, int], Color]
 """Type for a colour map."""
 
 
 ##############################################################################
-@lru_cache()
+@lru_cache
 def default_map(value: int, max_iteration: int) -> Color:
     """Calculate a colour for an escape value.
 
@@ -69,7 +69,7 @@ def blue_brown_map(value: int, _: int) -> Color:
 
 
 ##############################################################################
-@lru_cache()
+@lru_cache
 def shades_of_red(value: int, _: int) -> Color:
     """Calculate a colour for an escape value.
 
@@ -87,7 +87,7 @@ def shades_of_red(value: int, _: int) -> Color:
 
 
 ##############################################################################
-@lru_cache()
+@lru_cache
 def shades_of_green(value: int, _: int) -> Color:
     """Calculate a colour for an escape value.
 
@@ -105,7 +105,7 @@ def shades_of_green(value: int, _: int) -> Color:
 
 
 ##############################################################################
-@lru_cache()
+@lru_cache
 def shades_of_blue(value: int, _: int) -> Color:
     """Calculate a colour for an escape value.
 
@@ -118,13 +118,70 @@ def shades_of_blue(value: int, _: int) -> Color:
     return BLUES[value % 16]
 
 
+##############################################################################
+@lru_cache
+def blues_and_pinks(value: int, max_iteration: int) -> Color:
+    """Calculate a colour for an escape value.
+
+    Args:
+        value: An escape value from a Mandelbrot set.
+
+    Returns:
+        The colour to plot the point with.
+    """
+    return (
+        Gradient(
+            (0, Color(245, 169, 184)),
+            (0.125, Color(91, 206, 250)),
+            (0.25, Color(245, 169, 184)),
+            (0.375, Color(91, 206, 250)),
+            (0.5, Color(245, 169, 184)),
+            (0.625, Color(91, 206, 250)),
+            (0.75, Color(245, 169, 184)),
+            (0.875, Color(91, 206, 250)),
+            (1, Color(245, 169, 184)),
+            quality=max_iteration,
+        ).get_color((1 / max_iteration) * value)
+        if value
+        else Color(0, 0, 0)
+    )
+
+
+##############################################################################
+@lru_cache
+def rainbow(value: int, max_iteration: int) -> Color:
+    """Calculate a colour for an escape value.
+
+    Args:
+        value: An escape value from a Mandelbrot set.
+
+    Returns:
+        The colour to plot the point with.
+    """
+    return (
+        Gradient(
+            (0, Color(288, 3, 3)),
+            (0.2, Color(255, 140, 0)),
+            (0.4, Color(255, 237, 0)),
+            (0.6, Color(0, 128, 38)),
+            (0.8, Color(0, 76, 255)),
+            (1, Color(115, 41, 130)),
+            quality=max_iteration,
+        ).get_color((1 / max_iteration) * value)
+        if value
+        else Color(0, 0, 0)
+    )
+
+
 ##############################################################################
 COLOUR_MAPS: Final[dict[str, ColourMap]] = {
     "blue_brown_map": blue_brown_map,
     "default_map": default_map,
     "shades_of_blue": shades_of_blue,
     "shades_of_green": shades_of_green,
     "shades_of_red": shades_of_red,
+    "blues_and_pinks": blues_and_pinks,
+    "rainbow": rainbow,
 }
 """Name to colour map function map."""
 

src/complexitty/providers/main.py

@@ -31,7 +31,9 @@
     Quit,
     Reset,
     SetColourToBluesAndBrowns,
+    SetColourToBluesAndPinks,
     SetColourToDefault,
+    SetColourToRainbow,
     SetColourToShadesOfBlue,
     SetColourToShadesOfGreen,
     SetColourToShadesOfRed,
@@ -74,7 +76,9 @@ def commands(self) -> CommandHits:
         yield Quit()
         yield Reset()
         yield SetColourToBluesAndBrowns()
+        yield SetColourToBluesAndPinks()
         yield SetColourToDefault()
+        yield SetColourToRainbow()
         yield SetColourToShadesOfBlue()
         yield SetColourToShadesOfGreen()
         yield SetColourToShadesOfRed()

src/complexitty/screens/main.py

@@ -40,7 +40,9 @@
     Quit,
     Reset,
     SetColourToBluesAndBrowns,
+    SetColourToBluesAndPinks,
     SetColourToDefault,
+    SetColourToRainbow,
     SetColourToShadesOfBlue,
     SetColourToShadesOfGreen,
     SetColourToShadesOfRed,
@@ -90,7 +92,9 @@ class Main(EnhancedScreen[None]):
         MoveUpSlowly,
         Reset,
         SetColourToBluesAndBrowns,
+        SetColourToBluesAndPinks,
         SetColourToDefault,
+        SetColourToRainbow,
         SetColourToShadesOfBlue,
         SetColourToShadesOfGreen,
         SetColourToShadesOfRed,