Merge pull request #1 from adafruit/master

merging from Adafruit

diff --git a/README.rst b/README.rst
index b2b96c69c38b5977326a1e6b0374c3104690efb1..1cf7d5c5db97acf7e7d71765a240323714e9fb11 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -61,4 +61,4 @@ before contributing to help this project stay welcoming.
 Documentation
 =============
 
-For information on building library documentation, please check out `this guide <https://learn.adafruit.com/creating-and-sharing-a-blinka-library/sharing-our-docs-on-readthedocs#sphinx-5-1>`_.
+For information on building library documentation, please check out `this guide <https://learn.adafruit.com/creating-and-sharing-a-circuitpython-library/sharing-our-docs-on-readthedocs#sphinx-5-1>`_.

diff --git a/displayio/display.py b/displayio/display.py
index 1ea5d5555d5911a4d0b127af498e3d129ede13ff..5f0a4aba745d45105a7eb35680370f171dc3a921 100644 (file)
--- a/displayio/display.py
+++ b/displayio/display.py
@@ -42,6 +42,7 @@ import digitalio
 from PIL import Image
 import numpy
 from recordclass import recordclass
+from displayio.colorconverter import ColorConverter
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
@@ -53,8 +54,9 @@ BACKLIGHT_IN_OUT = 1
 BACKLIGHT_PWM = 2
 
 # pylint: disable=unnecessary-pass, unused-argument
-
 # pylint: disable=too-many-instance-attributes
+
+
 class Display:
     """This initializes a display and connects it into CircuitPython. Unlike other objects
     in CircuitPython, Display objects live until ``displayio.release_displays()`` is called.
@@ -152,6 +154,7 @@ class Display:
         self._refresh_thread = None
         if self._auto_refresh:
             self.auto_refresh = True
+        self._colorconverter = ColorConverter()
 
         self._backlight_type = None
         if backlight_pin is not None:
@@ -332,7 +335,11 @@ class Display:
 
     def fill_row(self, y, buffer):
         """Extract the pixels from a single row"""
-        pass
+        for x in range(0, self._width):
+            _rgb_565 = self._colorconverter.convert(self._buffer.getpixel((x, y)))
+            buffer[x * 2] = (_rgb_565 >> 8) & 0xFF
+            buffer[x * 2 + 1] = _rgb_565 & 0xFF
+        return buffer
 
     @property
     def auto_refresh(self):

diff --git a/displayio/tilegrid.py b/displayio/tilegrid.py
index 2b2f8c7ad7d4755c3330df23c7704d1d6cce8138..58062531d98a2cf649ea16f471d717c87464fd67 100644 (file)
--- a/displayio/tilegrid.py
+++ b/displayio/tilegrid.py
@@ -215,7 +215,7 @@ class TileGrid:
         )
         image.putalpha(alpha.convert("L"))
 
-    # pylint: disable=too-many-locals,too-many-branches
+    # pylint: disable=too-many-locals,too-many-branches,too-many-statements
     def _fill_area(self, buffer):
         """Draw onto the image"""
         if self._hidden:
@@ -224,70 +224,86 @@ class TileGrid:
         if self._bitmap.width <= 0 or self._bitmap.height <= 0:
             return
 
-        image = Image.new(
-            "RGBA",
-            (self._width * self._tile_width, self._height * self._tile_height),
-            (0, 0, 0, 0),
-        )
-
-        tile_count_x = self._bitmap.width // self._tile_width
+        # Copy class variables to local variables in case something changes
         x = self._x
         y = self._y
+        width = self._width
+        height = self._height
+        tile_width = self._tile_width
+        tile_height = self._tile_height
+        bitmap_width = self._bitmap.width
+        pixel_width = self._pixel_width
+        pixel_height = self._pixel_height
+        tiles = self._tiles
+        absolute_transform = self._absolute_transform
+        pixel_shader = self._pixel_shader
+        bitmap = self._bitmap
+        tiles = self._tiles
+
+        tile_count_x = bitmap_width // tile_width
+
+        image = Image.new(
+            "RGBA", (width * tile_width, height * tile_height), (0, 0, 0, 0),
+        )
 
-        for tile_x in range(self._width):
-            for tile_y in range(self._height):
-                tile_index = self._tiles[tile_y * self._width + tile_x]
+        for tile_x in range(width):
+            for tile_y in range(height):
+                tile_index = tiles[tile_y * width + tile_x]
                 tile_index_x = tile_index % tile_count_x
                 tile_index_y = tile_index // tile_count_x
-                tile_image = self._bitmap._image  # pylint: disable=protected-access
-                if isinstance(self._pixel_shader, Palette):
+                tile_image = bitmap._image  # pylint: disable=protected-access
+                if isinstance(pixel_shader, Palette):
                     tile_image = tile_image.copy().convert("P")
                     self._apply_palette(tile_image)
                     tile_image = tile_image.convert("RGBA")
                     self._add_alpha(tile_image)
-                elif isinstance(self._pixel_shader, ColorConverter):
+                elif isinstance(pixel_shader, ColorConverter):
                     # This will be needed for eInks, grayscale, and monochrome displays
                     pass
                 image.alpha_composite(
                     tile_image,
-                    dest=(tile_x * self._tile_width, tile_y * self._tile_height),
-                    source=(
-                        tile_index_x * self._tile_width,
-                        tile_index_y * self._tile_height,
-                    ),
+                    dest=(tile_x * tile_width, tile_y * tile_height),
+                    source=(tile_index_x * tile_width, tile_index_y * tile_height,),
                 )
 
-        if self._absolute_transform is not None:
-            if self._absolute_transform.scale > 1:
+        if absolute_transform is not None:
+            if absolute_transform.scale > 1:
                 image = image.resize(
                     (
-                        self._pixel_width * self._absolute_transform.scale,
-                        self._pixel_height * self._absolute_transform.scale,
+                        pixel_width * absolute_transform.scale,
+                        pixel_height * absolute_transform.scale,
                     ),
                     resample=Image.NEAREST,
                 )
-            if self._absolute_transform.mirror_x:
+            if absolute_transform.mirror_x:
                 image = image.transpose(Image.FLIP_LEFT_RIGHT)
-            if self._absolute_transform.mirror_y:
+            if absolute_transform.mirror_y:
                 image = image.transpose(Image.FLIP_TOP_BOTTOM)
-            if self._absolute_transform.transpose_xy:
+            if absolute_transform.transpose_xy:
                 image = image.transpose(Image.TRANSPOSE)
-            x *= self._absolute_transform.dx
-            y *= self._absolute_transform.dy
-            x += self._absolute_transform.x
-            y += self._absolute_transform.y
+            x *= absolute_transform.dx
+            y *= absolute_transform.dy
+            x += absolute_transform.x
+            y += absolute_transform.y
 
         source_x = source_y = 0
         if x < 0:
-            source_x = 0 - x
+            source_x = round(0 - x)
             x = 0
         if y < 0:
-            source_y = 0 - y
+            source_y = round(0 - y)
             y = 0
 
-        buffer.alpha_composite(
-            image, (round(x), round(y)), source=(round(source_x), round(source_y))
-        )
+        x = round(x)
+        y = round(y)
+
+        if (
+            x <= buffer.width
+            and y <= buffer.height
+            and source_x <= image.width
+            and source_y <= image.height
+        ):
+            buffer.alpha_composite(image, (x, y), source=(source_x, source_y))
 
     # pylint: enable=too-many-locals,too-many-branches