bug fixes

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / _palette.py

diff --git a/displayio/_palette.py b/displayio/_palette.py
index af72dcbf4c1b216fa10eeec6c3207b77c8aa5d13..6db240252b7a77184e88d34d945cb40b399eb1cd 100644 (file)
--- a/displayio/_palette.py
+++ b/displayio/_palette.py
@@ -18,7 +18,7 @@ displayio for Blinka
 """
 
 from typing import Optional, Union, Tuple
 """
 
 from typing import Optional, Union, Tuple

-import circuitpython_typing
+from circuitpython_typing import ReadableBuffer

 from ._colorconverter import ColorConverter
 from ._colorspace import Colorspace
 from ._structs import InputPixelStruct, OutputPixelStruct, ColorStruct
 from ._colorconverter import ColorConverter
 from ._colorspace import Colorspace
 from ._structs import InputPixelStruct, OutputPixelStruct, ColorStruct


@@ -28,22 +28,26 @@ __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 class Palette:
 
 
 class Palette:

-    """Map a pixel palette_index to a full color. Colors are transformed to the display’s
+    """Map a pixel palette_index to a full color. Colors are transformed to the display's

     format internally to save memory.
     """
 
     format internally to save memory.
     """
 

-    def __init__(self, color_count: int, dither: bool = False):
-        """Create a Palette object to store a set number of colors."""
+    def __init__(self, color_count: int, *, dither: bool = False):
+        """Create a Palette object to store a set number of colors.
+
+        :param int color_count: The number of colors in the Palette
+        :param bool dither: When true, dither the RGB color before converting to the
+                            display's color space
+        """

         self._needs_refresh = False
         self._dither = dither
 
         self._colors = []
         for _ in range(color_count):
         self._needs_refresh = False
         self._dither = dither
 
         self._colors = []
         for _ in range(color_count):

-            self._colors.append(self._make_color(0))
-
-    def _make_color(self, value, transparent=False):
-        color = ColorStruct(transparent=transparent)
+            self._colors.append(ColorStruct())

 
 

+    @staticmethod
+    def _color_to_int(value):

         if isinstance(value, (tuple, list, bytes, bytearray)):
             value = (value[0] & 0xFF) << 16 | (value[1] & 0xFF) << 8 | value[2] & 0xFF
         elif isinstance(value, int):
         if isinstance(value, (tuple, list, bytes, bytearray)):
             value = (value[0] & 0xFF) << 16 | (value[1] & 0xFF) << 8 | value[2] & 0xFF
         elif isinstance(value, int):


@@ -51,10 +55,7 @@ class Palette:
                 raise ValueError("Color must be between 0x000000 and 0xFFFFFF")
         else:
             raise TypeError("Color buffer must be a buffer, tuple, list, or int")
                 raise ValueError("Color must be between 0x000000 and 0xFFFFFF")
         else:
             raise TypeError("Color buffer must be a buffer, tuple, list, or int")

-        color.rgb888 = value
-        self._needs_refresh = True
-
-        return color
+        return value

 
     def __len__(self) -> int:
         """Returns the number of colors in a Palette"""
 
     def __len__(self) -> int:
         """Returns the number of colors in a Palette"""


@@ -63,7 +64,7 @@ class Palette:
     def __setitem__(
         self,
         index: int,
     def __setitem__(
         self,
         index: int,

-        value: Union[int, circuitpython_typing.ReadableBuffer, Tuple[int, int, int]],
+        value: Union[int, ReadableBuffer, Tuple[int, int, int]],

     ) -> None:
         """Sets the pixel color at the given index. The index should be
         an integer in the range 0 to color_count-1.
     ) -> None:
         """Sets the pixel color at the given index. The index should be
         an integer in the range 0 to color_count-1.


@@ -72,8 +73,14 @@ class Palette:
         (to represent an RGB value). Value can be an int, bytes (3 bytes (RGB) or
         4 bytes (RGB + pad byte)), bytearray, or a tuple or list of 3 integers.
         """
         (to represent an RGB value). Value can be an int, bytes (3 bytes (RGB) or
         4 bytes (RGB + pad byte)), bytearray, or a tuple or list of 3 integers.
         """

-        if self._colors[index].rgb888 != value:
-            self._colors[index] = self._make_color(value)
+        self._set_color(index, self._color_to_int(value))
+
+    def _set_color(self, palette_index: int, color: int):
+        if self._colors[palette_index].rgb888 == color:
+            return
+        self._colors[palette_index].rgb888 = color
+        self._colors[palette_index].cached_colorspace = None
+        self._needs_refresh = True

 
     def __getitem__(self, index: int) -> Optional[int]:
         if not 0 <= index < len(self._colors):
 
     def __getitem__(self, index: int) -> Optional[int]:
         if not 0 <= index < len(self._colors):


@@ -83,26 +90,12 @@ class Palette:
     def make_transparent(self, palette_index: int) -> None:
         """Set the palette index to be a transparent color"""
         self._colors[palette_index].transparent = True
     def make_transparent(self, palette_index: int) -> None:
         """Set the palette index to be a transparent color"""
         self._colors[palette_index].transparent = True

+        self._needs_refresh = True

 
     def make_opaque(self, palette_index: int) -> None:
         """Set the palette index to be an opaque color"""
         self._colors[palette_index].transparent = False
 
     def make_opaque(self, palette_index: int) -> None:
         """Set the palette index to be an opaque color"""
         self._colors[palette_index].transparent = False

-
-    def _get_palette(self):
-        """Generate a palette for use with PIL"""
-        palette = []
-        for color in self._colors:
-            palette += color.rgba()[0:3]
-        return palette
-
-    def _get_alpha_palette(self):
-        """Generate an alpha channel palette with white being
-        opaque and black being transparent"""
-        palette = []
-        for color in self._colors:
-            for _ in range(3):
-                palette += [0 if color.transparent else 0xFF]
-        return palette
+        self._needs_refresh = True

 
     def _get_color(
         self,
 
     def _get_color(
         self,


@@ -126,6 +119,7 @@ class Palette:
             return
 
         rgb888_pixel = input_pixel
             return
 
         rgb888_pixel = input_pixel

+        rgb888_pixel.pixel = self._colors[palette_index].rgb888

         ColorConverter._convert_color(  # pylint: disable=protected-access
             colorspace, self._dither, rgb888_pixel, output_color
         )
         ColorConverter._convert_color(  # pylint: disable=protected-access
             colorspace, self._dither, rgb888_pixel, output_color
         )


@@ -140,7 +134,7 @@ class Palette:
         return self._colors[palette_index].transparent
 
     def _finish_refresh(self):
         return self._colors[palette_index].transparent
 
     def _finish_refresh(self):

-        pass
+        self._needs_refresh = False

 
     @property
     def dither(self) -> bool:
 
     @property
     def dither(self) -> bool: