Scaling, Mirroring, etc. now working + linted

[hackapet/Adafruit_Blinka_Displayio.git] / fontio.py

diff --git a/fontio.py b/fontio.py
index e64ce68ac142726e5df6ffa119f11dfdf20af52c..94d21f7126e06b871081073a4d4ab3bca072c553 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -57,11 +57,6 @@ class BuiltinFont:
             for y in range(bmp_size[1]):
                 self._bitmap[x, y] = 1 if ascii_mask.getpixel((x, y)) else 0
 
             for y in range(bmp_size[1]):
                 self._bitmap[x, y] = 1 if ascii_mask.getpixel((x, y)) else 0
 

-    def _get_glyph_index(self, charcode):
-        if 0x20 <= charcode <= 0x7E:
-            return charcode - 0x20
-        return None
-

     def get_bounding_box(self):
         """Returns the maximum bounds of all glyphs in the font in
         a tuple of two values: width, height.
     def get_bounding_box(self):
         """Returns the maximum bounds of all glyphs in the font in
         a tuple of two values: width, height.


@@ -70,15 +65,21 @@ class BuiltinFont:
 
     def get_glyph(self, codepoint):
         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""
 
     def get_glyph(self, codepoint):
         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""

+        if 0x20 <= codepoint <= 0x7E:
+            glyph_index = codepoint - 0x20
+        else:
+            return None
+

         bounding_box = self._font.getsize(chr(codepoint))
         bounding_box = self._font.getsize(chr(codepoint))

+        width, height = bounding_box

         return Glyph(
             bitmap=self._bitmap,
         return Glyph(
             bitmap=self._bitmap,

-            tile_index=self._get_glyph_index(codepoint),
-            width=bounding_box[0],
-            height=bounding_box[1],
+            tile_index=glyph_index,
+            width=width,
+            height=height,

             dx=0,
             dy=0,
             dx=0,
             dy=0,

-            shift_x=0,
+            shift_x=width,

             shift_y=0,
         )
 
             shift_y=0,
         )
 


@@ -91,6 +92,7 @@ class BuiltinFont:
         return self._bitmap
 
 
         return self._bitmap
 
 

+# pylint: disable=too-few-public-methods, invalid-name

 class Glyph:
     """Storage of glyph info"""
 
 class Glyph:
     """Storage of glyph info"""
 


@@ -103,3 +105,6 @@ class Glyph:
         self.shift_x = shift_x
         self.shift_y = shift_y
         self.tile_index = tile_index
         self.shift_x = shift_x
         self.shift_y = shift_y
         self.tile_index = tile_index

+
+
+# pylint: enable=too-few-public-methods, invalid-name