Bug fixes

[hackapet/Adafruit_Blinka_Displayio.git] / fontio.py

diff --git a/fontio.py b/fontio.py
index 828e15791c3ece1d12364b3a189b15e33ec7e3db..44faa6160052661b99000e66e6fc71518ab39966 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -43,23 +43,26 @@ __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 class BuiltinFont:
     """Simulate a font built into CircuitPython"""
 
 class BuiltinFont:
     """Simulate a font built into CircuitPython"""

+

     def __init__(self):
         self._font = ImageFont.load_default()
     def __init__(self):
         self._font = ImageFont.load_default()

-        ascii_chars = ""
-        for character in range(0x20, 0x7F):
-            ascii_chars += chr(character)
-        self._font.getmask(ascii_chars)
-        bmp_size = self._font.getsize(ascii_chars)
-        self._bitmap = Bitmap(bmp_size[0], bmp_size[1], 2)
-        ascii_mask = self._font.getmask(ascii_chars, mode="1")
-        for x in range(bmp_size[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
+        self._generate_bitmap(0x20, 0x7E)
+
+    def _generate_bitmap(self, start_range, end_range):
+        char_width, char_height = self.get_bounding_box()
+        self._bitmap = Bitmap(
+            char_width * (end_range - start_range + 1), char_height, 2
+        )
+        for character in range(start_range, end_range + 1):
+            ascii_char = chr(character)
+            ascii_mask = self._font.getmask(ascii_char, mode="1")
+            for y in range(char_height):
+                for x in range(char_width):
+                    color = ascii_mask.getpixel((x, y))
+                    character_position = character - start_range
+                    self._bitmap[character_position * char_width + x, y] = (
+                        1 if color else 0
+                    )

 
     def get_bounding_box(self):
         """Returns the maximum bounds of all glyphs in the font in
 
     def get_bounding_box(self):
         """Returns the maximum bounds of all glyphs in the font in


@@ -69,15 +72,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,
         )
 


@@ -90,9 +99,11 @@ 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"""

-    def __init__(self, *, bitmap, tile_index, width, height, dx, dy, shift_x, shift_y):
+
+    def __init__(self, bitmap, tile_index, width, height, dx, dy, shift_x, shift_y):

         self.bitmap = bitmap
         self.width = width
         self.height = height
         self.bitmap = bitmap
         self.width = width
         self.height = height


@@ -101,3 +112,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