From: Melissa LeBlanc-Williams Date: Mon, 16 May 2022 22:15:53 +0000 (-0600) Subject: Merge pull request #91 from FoamyGuy/bitmap_setter X-Git-Tag: 0.10.2~1 X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/964360ae05004ddaaf20df7739bed9e80a62e5a2?ds=inline;hp=-c Merge pull request #91 from FoamyGuy/bitmap_setter bitmap getter and setter. and pixel_shader setter --- 964360ae05004ddaaf20df7739bed9e80a62e5a2 diff --combined displayio/_tilegrid.py index 999ddb2,ca3a31f..7fc9189 --- a/displayio/_tilegrid.py +++ b/displayio/_tilegrid.py @@@ -381,6 -381,42 +381,42 @@@ class TileGrid """The pixel shader of the tilegrid.""" return self._pixel_shader + @pixel_shader.setter + def pixel_shader(self, new_pixel_shader: Union[ColorConverter, Palette]) -> None: + if not isinstance(new_pixel_shader, ColorConverter) and not isinstance( + new_pixel_shader, Palette + ): + raise TypeError( + "Unsupported Type: new_pixel_shader must be ColorConverter or Palette" + ) + + self._pixel_shader = new_pixel_shader + + @property + def bitmap(self) -> Union[Bitmap, OnDiskBitmap, Shape]: + """The Bitmap, OnDiskBitmap, or Shape that is assigned to this TileGrid""" + return self._bitmap + + @bitmap.setter + def bitmap(self, new_bitmap: Union[Bitmap, OnDiskBitmap, Shape]) -> None: + + if ( + not isinstance(new_bitmap, Bitmap) + and not isinstance(new_bitmap, OnDiskBitmap) + and not isinstance(new_bitmap, Shape) + ): + raise TypeError( + "Unsupported Type: new_bitmap must be Bitmap, OnDiskBitmap, or Shape" + ) + + if ( + new_bitmap.width != self.bitmap.width + or new_bitmap.height != self.bitmap.height + ): + raise ValueError("New bitmap must be same size as old bitmap") + + self._bitmap = new_bitmap + def _extract_and_check_index(self, index): if isinstance(index, (tuple, list)): x = index[0] @@@ -408,23 -444,3 +444,23 @@@ if not 0 <= value <= 255: raise ValueError("Tile value out of bounds") self._tiles[index] = value + + @property + def width(self) -> int: + """Width in tiles""" + return self._width + + @property + def height(self) -> int: + """Height in tiles""" + return self._height + + @property + def tile_width(self) -> int: + """Width of each tile in pixels""" + return self._tile_width + + @property + def tile_height(self) -> int: + """Height of each tile in pixels""" + return self._tile_height