Added Group, Bitmap, Palette code

diff --git a/displayio.py b/displayio.py
index f61eee8307d50e71407b2d88ffd76c8245e0f6e0..11b9e56150e2567a055eac50db6261ce5fe52618 100644 (file)
--- a/displayio.py
+++ b/displayio.py
@@ -5,6 +5,7 @@
 import os
 import digitalio
 import time
 import os
 import digitalio
 import time

+from PIL import Image, ImageDraw

 
 """
 import asyncio
 
 """
 import asyncio


@@ -28,65 +29,179 @@ __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 _displays = []
 _groups = []
 
 _displays = []
 _groups = []
 

-class _DisplayioSingleton():
+
+class _DisplayioSingleton:

     def __init__(self):
         pass
 
     def __init__(self):
         pass
 

+

 def release_displays():
 def release_displays():

-    """Releases any actively used displays so their busses and pins can be used again. This will also release the builtin display on boards that have one. You will need to reinitialize it yourself afterwards.
+    """Releases any actively used displays so their busses and pins can be used again.

 
     Use this once in your code.py if you initialize a display. Place it right before the initialization so the display is active as long as possible.
     """
 
     Use this once in your code.py if you initialize a display. Place it right before the initialization so the display is active as long as possible.
     """

+    for _disp in _displays:
+        _disp._release()

     _displays.clear()
 
 
 class Bitmap:
     """Stores values of a certain size in a 2D array"""
     _displays.clear()
 
 
 class Bitmap:
     """Stores values of a certain size in a 2D array"""

+

     def __init__(self, width, height, value_count):
         """Create a Bitmap object with the given fixed size. Each pixel stores a value that is used to index into a corresponding palette. This enables differently colored sprites to share the underlying Bitmap. value_count is used to minimize the memory used to store the Bitmap.
         """
     def __init__(self, width, height, value_count):
         """Create a Bitmap object with the given fixed size. Each pixel stores a value that is used to index into a corresponding palette. This enables differently colored sprites to share the underlying Bitmap. value_count is used to minimize the memory used to store the Bitmap.
         """

-        pass
-        
+        self._width = width
+        self._height = height
+        self._read_only = False
+
+        if value_count < 0:
+            raise ValueError("value_count must be > 0")
+
+        bits = 1
+        while (value_count - 1) >> bits:
+            if bits < 8:
+                bits = bits << 1
+            else:
+                bits += 8
+
+        self._bits_per_value = bits
+
+        if (
+            self._bits_per_value > 8
+            and self._bits_per_value != 16
+            and self._bits_per_value != 32
+        ):
+            raise NotImplementedError("Invalid bits per value")
+
+        self._data = (width * height) * [0]
+        self._dirty_area = {"x1": 0, "x2": width, "y1": 0, "y2": height}
+

     def __getitem__(self, index):
         """
         Returns the value at the given index. The index can either be
         an x,y tuple or an int equal to `y * width + x`.
         """
     def __getitem__(self, index):
         """
         Returns the value at the given index. The index can either be
         an x,y tuple or an int equal to `y * width + x`.
         """

-        pass
+        if isinstance(index, (tuple, list)):
+            index = index[1] * self._width + index[0]
+        return self._data[index]

 
     def __setitem__(self, index, value):
         """
         Sets the value at the given index. The index can either be
         an x,y tuple or an int equal to `y * width + x`.
         """
 
     def __setitem__(self, index, value):
         """
         Sets the value at the given index. The index can either be
         an x,y tuple or an int equal to `y * width + x`.
         """

-        pass
-        
+        if self._read_only:
+            raise RuntimeError("Read-only object")
+        if isinstance(index, (tuple, list)):
+            x = index[0]
+            y = index[1]
+            index = y * self._width + x
+        elif ininstance(index, int):
+            x = index % self._width
+            y = index // self._width
+        self._data[index] = value
+        if self._dirty_area["x1"] == self._dirty_area["x2"]:
+            self._dirty_area["x1"] = x
+            self._dirty_area["x2"] = x + 1
+            self._dirty_area["y1"] = y
+            self._dirty_area["y2"] = y + 1
+        else:
+            if x < self._dirty_area["x1"]:
+                self._dirty_area["x1"] = x
+            elif x >= self._dirty_area["x2"]:
+                self._dirty_area["x2"] = x + 1
+            if y < self._dirty_area["y1"]:
+                self._dirty_area["y1"] = y
+            elif y >= self._dirty_area["y2"]:
+                self._dirty_area["y2"] = y + 1
+
+    def _finish_refresh(self):
+        self._dirty_area["x1"] = 0
+        self._dirty_area["x2"] = 0
+

     def fill(self, value):
         """Fills the bitmap with the supplied palette index value."""
     def fill(self, value):
         """Fills the bitmap with the supplied palette index value."""

-        pass
+        self._data = (self._width * self._height) * [value]
+        self._dirty_area = {"x1": 0, "x2": self._width, "y1": 0, "y2": self._height}

 
     @property
     def width(self):
         """Width of the bitmap. (read only)"""
 
     @property
     def width(self):
         """Width of the bitmap. (read only)"""

-        pass
+        return self._width

 
     @property
     def height(self):
         """Height of the bitmap. (read only)"""
 
     @property
     def height(self):
         """Height of the bitmap. (read only)"""

-        pass
+        return self._height

 
 
 class ColorConverter:
 
 
 class ColorConverter:

-    """Converts one color format to another."""
-    def __init__(self):
+    """Converts one color format to another. Color converter based on original displayio
+    code for consistency.
+    """
+
+    def __init__(self, *, dither=False):

         """Create a ColorConverter object to convert color formats.
         Only supports RGB888 to RGB565 currently.
         """Create a ColorConverter object to convert color formats.
         Only supports RGB888 to RGB565 currently.

+        :param bool dither: Adds random noise to dither the output image

         """
         """

-        self._dither = False
-        
+        self._dither = dither
+        self._depth = 16
+
+    def _compute_rgb565(self, color):
+        self._depth = 16
+        return (color >> 19) << 11 | ((color >> 10) & 0x3F) << 5 | (color >> 3) & 0x1F
+
+    def _compute_luma(self, color):
+        r8 = color >> 16
+        g8 = (color >> 8) & 0xFF
+        b8 = color & 0xFF
+        return (r8 * 19) / 255 + (g8 * 182) / 255 + (b8 + 54) / 255
+
+    def _compute_chroma(self, color):
+        r8 = color >> 16
+        g8 = (color >> 8) & 0xFF
+        b8 = color & 0xFF
+        return max(r8, g8, b8) - min(r8, g8, b8)
+
+    def _compute_hue(self, color):
+        r8 = color >> 16
+        g8 = (color >> 8) & 0xFF
+        b8 = color & 0xFF
+        max_color = max(r8, g8, b8)
+        chroma = self._compute_chroma(color)
+        if chroma == 0:
+            return 0
+        hue = 0
+        if max_color == r8:
+            hue = (((g8 - b8) * 40) / chroma) % 240
+        elif max_color == g8:
+            hue = (((b8 - r8) + (2 * chroma)) * 40) / chroma
+        elif max_color == b8:
+            hue = (((r8 - g8) + (4 * chroma)) * 40) / chroma
+        if hue < 0:
+            hue += 240
+
+        return hue
+
+    def _dither_noise_1(self, noise):
+        n = (n >> 13) ^ n
+        nn = (n * (n * n * 60493 + 19990303) + 1376312589) & 0x7FFFFFFF
+        return (nn / (1073741824.0 * 2)) * 255
+
+    def _dither_noise_2(self, x, y):
+        return self._dither_noise_1(x + y * 0xFFFF)
+
+    def _compute_tricolor(self):
+        pass
+

     def convert(self, color):
         "Converts the given RGB888 color to RGB565"
     def convert(self, color):
         "Converts the given RGB888 color to RGB565"

-        pass
+        if self._dither:
+            return color  # To Do: return a dithered color
+        else:
+            return self._compute_rgb565(color)

 
     @property
     def dither(self):
 
     @property
     def dither(self):


@@ -108,7 +223,35 @@ class Display:
     .. class:: Display(display_bus, init_sequence, *, width, height, colstart=0, rowstart=0, rotation=0, color_depth=16, grayscale=False, pixels_in_byte_share_row=True, bytes_per_cell=1, reverse_pixels_in_byte=False, set_column_command=0x2a, set_row_command=0x2b, write_ram_command=0x2c, set_vertical_scroll=0, backlight_pin=None, brightness_command=None, brightness=1.0, auto_brightness=False, single_byte_bounds=False, data_as_commands=False, auto_refresh=True, native_frames_per_second=60)
     
     """
     .. class:: Display(display_bus, init_sequence, *, width, height, colstart=0, rowstart=0, rotation=0, color_depth=16, grayscale=False, pixels_in_byte_share_row=True, bytes_per_cell=1, reverse_pixels_in_byte=False, set_column_command=0x2a, set_row_command=0x2b, write_ram_command=0x2c, set_vertical_scroll=0, backlight_pin=None, brightness_command=None, brightness=1.0, auto_brightness=False, single_byte_bounds=False, data_as_commands=False, auto_refresh=True, native_frames_per_second=60)
     
     """

-    def __init__(self, display_bus, init_sequence, *, width, height, colstart=0, rowstart=0, rotation=0, color_depth=16, grayscale=False, pixels_in_byte_share_row=True, bytes_per_cell=1, reverse_pixels_in_byte=False, set_column_command=0x2a, set_row_command=0x2b, write_ram_command=0x2c, set_vertical_scroll=0, backlight_pin=None, brightness_command=None, brightness=1.0, auto_brightness=False, single_byte_bounds=False, data_as_commands=False, auto_refresh=True, native_frames_per_second=60):
+
+    def __init__(
+        self,
+        display_bus,
+        init_sequence,
+        *,
+        width,
+        height,
+        colstart=0,
+        rowstart=0,
+        rotation=0,
+        color_depth=16,
+        grayscale=False,
+        pixels_in_byte_share_row=True,
+        bytes_per_cell=1,
+        reverse_pixels_in_byte=False,
+        set_column_command=0x2A,
+        set_row_command=0x2B,
+        write_ram_command=0x2C,
+        set_vertical_scroll=0,
+        backlight_pin=None,
+        brightness_command=None,
+        brightness=1.0,
+        auto_brightness=False,
+        single_byte_bounds=False,
+        data_as_commands=False,
+        auto_refresh=True,
+        native_frames_per_second=60
+    ):

         """Create a Display object on the given display bus (`displayio.FourWire` or `displayio.ParallelBus`).
 
         The ``init_sequence`` is bitpacked to minimize the ram impact. Every command begins with a command byte followed by a byte to determine the parameter count and if a delay is need after. When the top bit of the second byte is 1, the next byte will be the delay time in milliseconds. The remaining 7 bits are the parameter count excluding any delay byte. The third through final bytes are the remaining command parameters. The next byte will begin a new command definition. Here is a portion of ILI9341 init code:
         """Create a Display object on the given display bus (`displayio.FourWire` or `displayio.ParallelBus`).
 
         The ``init_sequence`` is bitpacked to minimize the ram impact. Every command begins with a command byte followed by a byte to determine the parameter count and if a delay is need after. When the top bit of the second byte is 1, the next byte will be the delay time in milliseconds. The remaining 7 bits are the parameter count excluding any delay byte. The third through final bytes are the remaining command parameters. The next byte will begin a new command definition. Here is a portion of ILI9341 init code:


@@ -124,13 +267,25 @@ class Display:
 
         The initialization sequence should always leave the display memory access inline with the scan of the display to minimize tearing artifacts.
         """
 
         The initialization sequence should always leave the display memory access inline with the scan of the display to minimize tearing artifacts.
         """

-        self._display_bus = display_bus
-        self._set_column_command=0x2a
-        self._set_row_command=0x2b
-        self._write_ram_command=0x2c
-        self._brightness_command=brightness_command
+        self._bus = display_bus
+        self._set_column_command = 0x2A
+        self._set_row_command = 0x2B
+        self._write_ram_command = 0x2C
+        self._brightness_command = brightness_command

         self._data_as_commands = data_as_commands
         self._single_byte_bounds = single_byte_bounds
         self._data_as_commands = data_as_commands
         self._single_byte_bounds = single_byte_bounds

+        self._width = width
+        self._height = height
+        self._colstart = colstart
+        self._rowstart = rowstart
+        self._rotation = rotation
+        self._auto_brightness = auto_brightness
+        self._brightness = brightness
+        self._auto_refresh = auto_refresh
+        self._initialize(init_sequence)
+        _displays.append(self)
+
+    def _initialize(self, init_sequence):

         i = 0
         while i < len(init_sequence):
             command = bytes([init_sequence[i]])
         i = 0
         while i < len(init_sequence):
             command = bytes([init_sequence[i]])


@@ -138,22 +293,26 @@ class Display:
             delay = (data_size & 0x80) > 0
             data_size &= ~0x80
             data_byte = init_sequence[i + 2]
             delay = (data_size & 0x80) > 0
             data_size &= ~0x80
             data_byte = init_sequence[i + 2]

-            if (self._single_byte_bounds):
-                data = command + init_sequence[i + 2:i + 2 + data_size]
-                display_bus.send(True, data, toggle_every_byte=True)
+            if self._single_byte_bounds:
+                data = command + init_sequence[i + 2 : i + 2 + data_size]
+                self._bus.send(True, data, toggle_every_byte=True)

             else:
             else:

-                display_bus.send(True, command, toggle_every_byte=True)
-                if (data_size > 0):
-                    display_bus.send(False, init_sequence[i + 2:i + 2 + data_size])
+                self._bus.send(True, command, toggle_every_byte=True)
+                if data_size > 0:
+                    self._bus.send(False, init_sequence[i + 2 : i + 2 + data_size])

             delay_time_ms = 10
             delay_time_ms = 10

-            if (delay):
+            if delay:

                 data_size += 1
                 delay_time_ms = init_sequence[i + 1 + data_size]
                 data_size += 1
                 delay_time_ms = init_sequence[i + 1 + data_size]

-                if (delay_time_ms == 255):
+                if delay_time_ms == 255:

                     delay_time_ms = 500
             time.sleep(delay_time_ms / 1000)
             i += 2 + data_size
                     delay_time_ms = 500
             time.sleep(delay_time_ms / 1000)
             i += 2 + data_size

-        
+
+    def _release(self):
+        self._bus.release()
+        self._bus = None
+

     def show(self, group):
         """Switches to displaying the given group of layers. When group is None, the default CircuitPython terminal will be shown.
         """
     def show(self, group):
         """Switches to displaying the given group of layers. When group is None, the default CircuitPython terminal will be shown.
         """


@@ -167,62 +326,91 @@ class Display:
         When auto refresh is on, updates the display immediately. (The display will also update without calls to this.)
         """
         pass
         When auto refresh is on, updates the display immediately. (The display will also update without calls to this.)
         """
         pass

-        
+

     def fill_row(self, y, buffer):
         pass
 
     @property
     def auto_refresh(self):
     def fill_row(self, y, buffer):
         pass
 
     @property
     def auto_refresh(self):

-        pass
+        return self._auto_refresh

 
     @auto_refresh.setter
     def auto_refresh(self, value):
 
     @auto_refresh.setter
     def auto_refresh(self, value):

-        pass
+        self._auto_refresh = value

 
     @property
     def brightness(self):
         """The brightness of the display as a float. 0.0 is off and 1.0 is full `brightness`. When `auto_brightness` is True, the value of `brightness` will change automatically. If `brightness` is set, `auto_brightness` will be disabled and will be set to False.
         """
 
     @property
     def brightness(self):
         """The brightness of the display as a float. 0.0 is off and 1.0 is full `brightness`. When `auto_brightness` is True, the value of `brightness` will change automatically. If `brightness` is set, `auto_brightness` will be disabled and will be set to False.
         """

-        pass
+        return self._brightness

 
     @brightness.setter
     def brightness(self, value):
 
     @brightness.setter
     def brightness(self, value):

-        pass
+        self._brightness = value

 
     @property
     def auto_brightness(self):
         """True when the display brightness is adjusted automatically, based on an ambient light sensor or other method. Note that some displays may have this set to True by default, but not actually implement automatic brightness adjustment. `auto_brightness` is set to False if `brightness` is set manually.
         """
 
     @property
     def auto_brightness(self):
         """True when the display brightness is adjusted automatically, based on an ambient light sensor or other method. Note that some displays may have this set to True by default, but not actually implement automatic brightness adjustment. `auto_brightness` is set to False if `brightness` is set manually.
         """

-        pass
+        return self._auto_brightness

 
     @auto_brightness.setter
     def auto_brightness(self, value):
 
     @auto_brightness.setter
     def auto_brightness(self, value):

-        pass
+        self._auto_brightness = value

 
     @property
     def width(self):
 
     @property
     def width(self):

-        pass
+        return self._width

 
     @property
     def height(self):
 
     @property
     def height(self):

-        pass
+        return self._height

 
     @property
     def rotation(self):
         """The rotation of the display as an int in degrees."""
 
     @property
     def rotation(self):
         """The rotation of the display as an int in degrees."""

-        pass
+        return self._rotation

 
     @rotation.setter
     def rotation(self, value):
 
     @rotation.setter
     def rotation(self, value):

-        pass
+        if value not in (0, 90, 180, 270):
+            raise ValueError("Rotation must be 0/90/180/270")
+        self._rotation = value

 
     @property
     def bus(self):
 
     @property
     def bus(self):

-        pass
+        return self._bus

 
 
 class EPaperDisplay:
 
 
 class EPaperDisplay:

-    def __init__(self, display_bus, start_sequence, stop_sequence, *, width, height, ram_width, ram_height, colstart=0, rowstart=0, rotation=0, set_column_window_command=None, set_row_window_command=None, single_byte_bounds=False, write_black_ram_command, black_bits_inverted=False, write_color_ram_command=None, color_bits_inverted=False, highlight_color=0x000000, refresh_display_command, refresh_time=40, busy_pin=None, busy_state=True, seconds_per_frame=180, always_toggle_chip_select=False):
+    def __init__(
+        self,
+        display_bus,
+        start_sequence,
+        stop_sequence,
+        *,
+        width,
+        height,
+        ram_width,
+        ram_height,
+        colstart=0,
+        rowstart=0,
+        rotation=0,
+        set_column_window_command=None,
+        set_row_window_command=None,
+        single_byte_bounds=False,
+        write_black_ram_command,
+        black_bits_inverted=False,
+        write_color_ram_command=None,
+        color_bits_inverted=False,
+        highlight_color=0x000000,
+        refresh_display_command,
+        refresh_time=40,
+        busy_pin=None,
+        busy_state=True,
+        seconds_per_frame=180,
+        always_toggle_chip_select=False
+    ):

         """
         Create a EPaperDisplay object on the given display bus (displayio.FourWire or displayio.ParallelBus).
 
         """
         Create a EPaperDisplay object on the given display bus (displayio.FourWire or displayio.ParallelBus).
 


@@ -239,6 +427,7 @@ class EPaperDisplay:
         """Refreshes the display immediately or raises an exception if too soon. Use ``time.sleep(display.time_to_refresh)`` to sleep until a refresh can occur.
         """
         pass
         """Refreshes the display immediately or raises an exception if too soon. Use ``time.sleep(display.time_to_refresh)`` to sleep until a refresh can occur.
         """
         pass

+

     @property
     def time_to_refresh(self):
         """Time, in fractional seconds, until the ePaper display can be refreshed."""
     @property
     def time_to_refresh(self):
         """Time, in fractional seconds, until the ePaper display can be refreshed."""


@@ -261,15 +450,26 @@ class FourWire:
     """Manage updating a display over SPI four wire protocol in the background while
     Python code runs. It doesn’t handle display initialization.
     """
     """Manage updating a display over SPI four wire protocol in the background while
     Python code runs. It doesn’t handle display initialization.
     """

-    def __init__(self, spi_bus, *, command, chip_select, reset=None, baudrate=24000000, polarity=0, phase=0):
+
+    def __init__(
+        self,
+        spi_bus,
+        *,
+        command,
+        chip_select,
+        reset=None,
+        baudrate=24000000,
+        polarity=0,
+        phase=0
+    ):

         """Create a FourWire object associated with the given pins.
 
         The SPI bus and pins are then in use by the display until displayio.release_displays() is called even after a reload. (It does this so CircuitPython can use the display after your code is done.) So, the first time you initialize a display bus in code.py you should call :py:func`displayio.release_displays` first, otherwise it will error after the first code.py run.
         """
         self._dc = digitalio.DigitalInOut(command)
         self._dc.switch_to_output()
         """Create a FourWire object associated with the given pins.
 
         The SPI bus and pins are then in use by the display until displayio.release_displays() is called even after a reload. (It does this so CircuitPython can use the display after your code is done.) So, the first time you initialize a display bus in code.py you should call :py:func`displayio.release_displays` first, otherwise it will error after the first code.py run.
         """
         self._dc = digitalio.DigitalInOut(command)
         self._dc.switch_to_output()

-        self.chip_select = digitalio.DigitalInOut(chip_select)
-        self.chip_select.switch_to_output(value=True)
+        self._chip_select = digitalio.DigitalInOut(chip_select)
+        self._chip_select.switch_to_output(value=True)

 
         if reset is not None:
             self._reset = digitalio.DigitalInOut(reset)
 
         if reset is not None:
             self._reset = digitalio.DigitalInOut(reset)


@@ -281,114 +481,151 @@ class FourWire:
             pass
         self._spi.configure(baudrate=baudrate, polarity=polarity, phase=phase)
         self._spi.unlock()
             pass
         self._spi.configure(baudrate=baudrate, polarity=polarity, phase=phase)
         self._spi.unlock()

-        
+
+    def _release(self):
+        self.reset()
+        self._spi.deinit()
+        self._dc.deinit()
+        self._chip_select.deinit()
+        if self._reset is not None:
+            self._reset.deinit()
+

     def reset(self):
         if self._reset is not None:
     def reset(self):
         if self._reset is not None:

-            self.value = False
+            self._reset.value = False

             time.sleep(0.001)
             time.sleep(0.001)

-            self.value = True
+            self._reset.value = True

             time.sleep(0.001)
 
     def send(self, command, data, *, toggle_every_byte=False):
         while self._spi.try_lock():
             pass
         self._dc.value = not command
             time.sleep(0.001)
 
     def send(self, command, data, *, toggle_every_byte=False):
         while self._spi.try_lock():
             pass
         self._dc.value = not command

-        if (toggle_every_byte):
+        if toggle_every_byte:

             for byte in data:
                 self._spi.write(bytes([byte]))
             for byte in data:
                 self._spi.write(bytes([byte]))

-                self.chip_select.value = True
+                self._chip_select.value = True

                 time.sleep(0.000001)
                 time.sleep(0.000001)

-                self.chip_select.value = False
+                self._chip_select.value = False

         else:
             self._spi.write(data)
         self._spi.unlock()
 
         else:
             self._spi.write(data)
         self._spi.unlock()
 

+

 class Group:
     """Manage a group of sprites and groups and how they are inter-related."""
 class Group:
     """Manage a group of sprites and groups and how they are inter-related."""

+

     def __init__(self, *, max_size=4, scale=1, x=0, y=0):
         """Create a Group of a given size and scale. Scale is in
         one dimension. For example, scale=2 leads to a layer’s
         pixel being 2x2 pixels when in the group.
         """
     def __init__(self, *, max_size=4, scale=1, x=0, y=0):
         """Create a Group of a given size and scale. Scale is in
         one dimension. For example, scale=2 leads to a layer’s
         pixel being 2x2 pixels when in the group.
         """

-        pass
-        
+        if not isinstance(max_size, int) or max_size < 1:
+            raise ValueError("Max Size must be an integer and >= 1")
+        self._max_size = max_size
+        if not isinstance(scale, int) or scale < 1:
+            raise ValueError("Scale must be an integer and >= 1")
+        self._scale = scale
+        self._x = x
+        self._y = y
+        self._hidden = False
+        self._layers = []
+        self._supported_types = (TileGrid, Group)
+

     def append(self, layer):
         """Append a layer to the group. It will be drawn
         above other layers.
         """
     def append(self, layer):
         """Append a layer to the group. It will be drawn
         above other layers.
         """

-        pass
+        if not isinstance(layer, self._supported_types):
+            raise ValueError("Invalid Group Memeber")
+        if len(self._layers) == self._max_size:
+            raise RuntimeError("Group full")
+        self._layers.append(layer)

 
     def insert(self, index, layer):
         """Insert a layer into the group."""
 
     def insert(self, index, layer):
         """Insert a layer into the group."""

-        pass
-        
+        if not isinstance(layer, self._supported_types):
+            raise ValueError("Invalid Group Memeber")
+        if len(self._layers) == self._max_size:
+            raise RuntimeError("Group full")
+        self._layers.insert(index, layer)
+

     def index(self, layer):
         """Returns the index of the first copy of layer.
         Raises ValueError if not found.
         """
         pass
     def index(self, layer):
         """Returns the index of the first copy of layer.
         Raises ValueError if not found.
         """
         pass

-        
+

     def pop(self, index=-1):
         """Remove the ith item and return it."""
     def pop(self, index=-1):
         """Remove the ith item and return it."""

-        pass
-        
+        return self._layers.pop(index)
+

     def remove(self, layer):
         """Remove the first copy of layer. Raises ValueError
         if it is not present."""
         pass
     def remove(self, layer):
         """Remove the first copy of layer. Raises ValueError
         if it is not present."""
         pass

-        
+

     def __len__(self):
         """Returns the number of layers in a Group"""
     def __len__(self):
         """Returns the number of layers in a Group"""

-        pass
+        return len(self._layers)

 
     def __getitem__(self, index):
         """Returns the value at the given index."""
 
     def __getitem__(self, index):
         """Returns the value at the given index."""

-        pass
+        return self._layers[index]

 
     def __setitem__(self, index, value):
         """Sets the value at the given index."""
 
     def __setitem__(self, index, value):
         """Sets the value at the given index."""

-        pass
+        self._layers[index] = value

 
     def __delitem__(self, index):
         """Deletes the value at the given index."""
 
     def __delitem__(self, index):
         """Deletes the value at the given index."""

-        pass
+        del self._layers[index]

 
     @property
     def hidden(self):
 
     @property
     def hidden(self):

-        pass
+        return self._hidden

 
     @hidden.setter
     def hidden(self, value):
 
     @hidden.setter
     def hidden(self, value):

-        pass
+        if not isinstance(value, (bool, int)):
+            raise ValueError("Expecting a boolean or integer value")
+        self._hidden = bool(value)

 
     @property
     def scale(self):
 
     @property
     def scale(self):

-        pass
+        return self._scale

 
     @scale.setter
     def scale(self, value):
 
     @scale.setter
     def scale(self, value):

-        pass
+        if not isinstance(value, int) or value < 1:
+            raise ValueError("Scale must be an integer and at least 1")
+        self._scale = value

 
     @property
     def x(self):
 
     @property
     def x(self):

-        pass
+        return self._x

 
     @x.setter
     def x(self, value):
 
     @x.setter
     def x(self, value):

-        pass
+        if not isinstance(value, int):
+            raise ValueError("x must be an integer")
+        self._x = value

 
     @property
     def y(self):
 
     @property
     def y(self):

-        pass
+        return self._y

 
     @y.setter
     def y(self, value):
 
     @y.setter
     def y(self, value):

-        pass
+        if not isinstance(value, int):
+            raise ValueError("y must be an integer")
+        self._y = value

 
 
 class I2CDisplay:
     """Manage updating a display over I2C in the background while Python code runs. It doesn’t handle display initialization.
     """
 
 
 class I2CDisplay:
     """Manage updating a display over I2C in the background while Python code runs. It doesn’t handle display initialization.
     """

+

     def __init__(self, i2c_bus, *, device_address, reset=None):
         """Create a I2CDisplay object associated with the given I2C bus and reset pin.
 
     def __init__(self, i2c_bus, *, device_address, reset=None):
         """Create a I2CDisplay object associated with the given I2C bus and reset pin.
 


@@ -407,6 +644,7 @@ class OnDisplayBitmap:
     """
     Loads values straight from disk. This minimizes memory use but can lead to much slower pixel load times.
     These load times may result in frame tearing where only part of the image is visible."""
     """
     Loads values straight from disk. This minimizes memory use but can lead to much slower pixel load times.
     These load times may result in frame tearing where only part of the image is visible."""

+

     def __init__(self, file):
         pass
 
     def __init__(self, file):
         pass
 


@@ -423,26 +661,60 @@ class OnDisplayBitmap:
 
 class Palette:
     """Map a pixel palette_index to a full color. Colors are transformed to the display’s format internally to save memory."""
 
 class Palette:
     """Map a pixel palette_index to a full color. Colors are transformed to the display’s format internally to save memory."""

+

     def __init__(self, color_count):
         """Create a Palette object to store a set number of colors."""
     def __init__(self, color_count):
         """Create a Palette object to store a set number of colors."""

-        pass
+        self._needs_refresh = False
+        self._colors = []
+        for _ in range(color_count):
+            self._colors.append(self._make_color(0))
+
+    def _make_color(self, value):
+        color = {
+            "transparent": False,
+            "rgb888": 0,
+            "rgb565": 0,
+            "luma": 0,
+            "chroma": 0,
+            "hue": 0,
+        }
+        color_converter = ColorConverter()
+        if isinstance(value, (tuple, list, bytes, bytearray)):
+            value = (value[0] & 0xFF) << 16 | (value[1] & 0xFF) << 8 | value[2] & 0xFF
+        elif isinstance(value, int):
+            if not 0 <= value <= 0xFFFFFF:
+                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
+        color["rgb565"] = color_converter._compute_rgb565(value)
+        color["chroma"] = color_converter._compute_chroma(value)
+        color["luma"] = color_converter._compute_luma(value)
+        color["hue"] = color_converter._compute_hue(value)
+        self._needs_refresh = True
+
+        return color

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

-        pass
+        return len(self._colors)

 
     def __setitem__(self, index, value):
         """Sets the pixel color at the given index. The index should be an integer in the range 0 to color_count-1.
 
         The value argument represents a color, and can be from 0x000000 to 0xFFFFFF (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.
         """
 
     def __setitem__(self, index, value):
         """Sets the pixel color at the given index. The index should be an integer in the range 0 to color_count-1.
 
         The value argument represents a color, and can be from 0x000000 to 0xFFFFFF (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)
+
+    def __getitem__(self, index):

         pass
 
     def make_transparent(self, palette_index):
         pass
 
     def make_transparent(self, palette_index):

-        pass
+        self._colors[palette_index].transparent = True

 
     def make_opaque(self, palette_index):
 
     def make_opaque(self, palette_index):

-        pass
+        self._colors[palette_index].transparent = False

 
 
 class ParallelBus:
 
 
 class ParallelBus:


@@ -450,6 +722,7 @@ class ParallelBus:
     This protocol may be refered to as 8080-I Series Parallel Interface in datasheets.
     It doesn’t handle display initialization.
     """
     This protocol may be refered to as 8080-I Series Parallel Interface in datasheets.
     It doesn’t handle display initialization.
     """

+

     def __init__(self, i2c_bus, *, device_address, reset=None):
         """Create a ParallelBus object associated with the given pins. The bus is inferred from data0 by implying the next 7 additional pins on a given GPIO port.
 
     def __init__(self, i2c_bus, *, device_address, reset=None):
         """Create a ParallelBus object associated with the given pins. The bus is inferred from data0 by implying the next 7 additional pins on a given GPIO port.
 


@@ -473,12 +746,13 @@ class Shape:
     """Create a Shape object with the given fixed size. Each pixel is one bit and is stored by the column
     boundaries of the shape on each row. Each row’s boundary defaults to the full row.
     """
     """Create a Shape object with the given fixed size. Each pixel is one bit and is stored by the column
     boundaries of the shape on each row. Each row’s boundary defaults to the full row.
     """

+

     def __init__(self, width, height, *, mirror_x=False, mirror_y=False):
         """Create a Shape object with the given fixed size. Each pixel is one bit and is stored by the
         column boundaries of the shape on each row. Each row’s boundary defaults to the full row.
         """
         pass
     def __init__(self, width, height, *, mirror_x=False, mirror_y=False):
         """Create a Shape object with the given fixed size. Each pixel is one bit and is stored by the
         column boundaries of the shape on each row. Each row’s boundary defaults to the full row.
         """
         pass

-    
+

     def set_boundary(self, y, start_x, end_x):
         """Loads pre-packed data into the given row."""
         pass
     def set_boundary(self, y, start_x, end_x):
         """Loads pre-packed data into the given row."""
         pass


@@ -489,60 +763,91 @@ class TileGrid:
 
     A single tile grid is also known as a Sprite.
     """
 
     A single tile grid is also known as a Sprite.
     """

-    def __init__(self, bitmap, *, pixel_shader, width=1, height=1, tile_width=None, tile_height=None, default_tile=0, x=0, y=0):
+
+    def __init__(
+        self,
+        bitmap,
+        *,
+        pixel_shader,
+        width=1,
+        height=1,
+        tile_width=None,
+        tile_height=None,
+        default_tile=0,
+        x=0,
+        y=0
+    ):

         """Create a TileGrid object. The bitmap is source for 2d pixels. The pixel_shader is used to convert the value and its location to a display native pixel color. This may be a simple color palette lookup, a gradient, a pattern or a color transformer.
 
         tile_width and tile_height match the height of the bitmap by default.
         """
         """Create a TileGrid object. The bitmap is source for 2d pixels. The pixel_shader is used to convert the value and its location to a display native pixel color. This may be a simple color palette lookup, a gradient, a pattern or a color transformer.
 
         tile_width and tile_height match the height of the bitmap by default.
         """

-        pass
+        self._bitmap = bitmap
+        self._pixel_shader = pixel_shader
+        self_hidden = False
+        self._x = x
+        self._y = y
+        self._width = width
+        self._height = height
+        if tile_width is None:
+            tile_width = width
+        if tile_height is None:
+            tile_height = height
+        self._tile_width = tile_width
+        self._tile_height = tile_height

 
     @property
     def hidden(self):
         """True when the TileGrid is hidden. This may be False even when a part of a hidden Group."""
 
     @property
     def hidden(self):
         """True when the TileGrid is hidden. This may be False even when a part of a hidden Group."""

-        pass
+        return self_hidden

 
     @hidden.setter
     def hidden(self, value):
 
     @hidden.setter
     def hidden(self, value):

-        pass
+        self._hidden = value

 
     @property
     def x(self):
         """X position of the left edge in the parent."""
 
     @property
     def x(self):
         """X position of the left edge in the parent."""

-        pass
+        return self._x

 
     @property
     def y(self):
         """Y position of the top edge in the parent."""
 
     @property
     def y(self):
         """Y position of the top edge in the parent."""

-        pass
+        return self._y

 
     @property
     def flip_x(self):
         """If true, the left edge rendered will be the right edge of the right-most tile."""
 
     @property
     def flip_x(self):
         """If true, the left edge rendered will be the right edge of the right-most tile."""

-        pass
+        return self._flip_x

 
     @flip_x.setter
     def flip_x(self, value):
 
     @flip_x.setter
     def flip_x(self, value):

-        pass
+        if not isinstance(value, bool):
+            raise TypeError("Flip X should be a boolean type")
+        self._flip_x = value

 
     @property
     def flip_y(self):
         """If true, the top edge rendered will be the bottom edge of the bottom-most tile."""
 
     @property
     def flip_y(self):
         """If true, the top edge rendered will be the bottom edge of the bottom-most tile."""

-        pass
+        return self._flip_y

 
     @flip_y.setter
     def flip_y(self, value):
 
     @flip_y.setter
     def flip_y(self, value):

-        pass
+        if not isinstance(value, bool):
+            raise TypeError("Flip Y should be a boolean type")
+        self._flip_y = value

 
     @property
     def transpose_xy(self):
         """If true, the TileGrid’s axis will be swapped. When combined with mirroring, any 90 degree
         rotation can be achieved along with the corresponding mirrored version.
         """
 
     @property
     def transpose_xy(self):
         """If true, the TileGrid’s axis will be swapped. When combined with mirroring, any 90 degree
         rotation can be achieved along with the corresponding mirrored version.
         """

-        pass
+        return self._transpose_xy

 
     @transpose_xy.setter
     def transpose_xy(self, value):
 
     @transpose_xy.setter
     def transpose_xy(self, value):

-        pass
+        if not isinstance(value, bool):
+            raise TypeError("Transpose XY should be a boolean type")
+        self._transpose_xy = value

 
     @property
     def pixel_shader(self):
 
     @property
     def pixel_shader(self):


@@ -550,9 +855,24 @@ class TileGrid:
         pass
 
     def __getitem__(self, index):
         pass
 
     def __getitem__(self, index):

-        """Returns the tile index at the given index. The index can either be an x,y tuple or an int equal to ``y * width + x``'."""
-        pass
+        """Returns the tile index at the given index. The index can either be
+        an x,y tuple or an int equal to ``y * width + x``'.
+        """
+        if isinstance(index, (tuple, list)):
+            index = index[1] * self._width + index[0]
+        return self._data[index]

 
     def __setitem__(self, index, value):
 
     def __setitem__(self, index, value):

-        """Sets the tile index at the given index. The index can either be an x,y tuple or an int equal to ``y * width + x``."""
-        pass
+        """Sets the tile index at the given index. The index can either be
+        an x,y tuple or an int equal to ``y * width + x``.
+        """
+        if self._read_only:
+            raise RuntimeError("Read-only object")
+        if isinstance(index, (tuple, list)):
+            x = index[0]
+            y = index[1]
+            index = y * self._width + x
+        elif ininstance(index, int):
+            x = index % self._width
+            y = index // self._width
+        self._data[index] = value

diff --git a/setup.py b/setup.py
index 5899c176afd180bf4e1f953f0a4472dfb3c7fb61..d766dcd7b62735573de5b9e987a988f789ba1272 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,7 @@ setup(
     # Author details
     author="Adafruit Industries",
     author_email="circuitpython@adafruit.com",
     # Author details
     author="Adafruit Industries",
     author_email="circuitpython@adafruit.com",

-    install_requires=[
-        "Adafruit-Blinka",
-    ],
+    install_requires=["Adafruit-Blinka",],

     # Choose your license
     license="MIT",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     # Choose your license
     license="MIT",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/terminalio.py b/terminalio.py
index 90829bc4403ecf7b27bb1703955004c100194392..f73f6676dd586673500045003dd22a600894b939 100644 (file)
--- a/terminalio.py
+++ b/terminalio.py
@@ -1,9 +1,16 @@
 """
 """

-`_terminalio`
+`terminalio`

 """
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 """
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 

-FONT = None
-    
+import sys
+from PIL import ImageFont
+
+FONT = ImageFont.load_default()
+
+# sys.stdout = open('out.dat', 'w')
+
+
+# sys.stdout.close()