Basic support for selection between multiple fonts. Attempt to add heading to QR code, not yet finished.

camp_small.py

@@ -30,12 +30,12 @@ if __name__ == "__main__":
     success = Manager(t)
     success.add(ImageScreen(t, "drinka.gif", 0.2, 2, 20.0))
     success.add(Solid(t, 1.0))
-    success.add(QRScreen(t, url, 30.0))
+    success.add(QRScreen(t, url, 30.0, "Order:"))
     success.add(Solid(t, 1.0))
 
     fail = Manager(t)
     fail.add(ImageScreen(t, "attention.gif", 0.2, 2, 20.0, (0, 0, 0)))
-    fail.add(ScrollText(t, "The UbaBot Cocktail machine is currently closed. Please come back later for more drinks!", 2))
+    fail.add(ScrollText(t, "The UbaBot Cocktail machine is currently closed. Please come back later for more drinks!", "ib8x8u", 2))
     fail.add(Solid(t, 2.0))
     fail.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), None, 2.0))
     fail.add(Solid(t, 2.0))

draw.py

@@ -18,7 +18,7 @@ class DrawText:
 
         scriptDir = os.path.dirname(os.path.realpath(__file__))
         fontDir = os.path.join(scriptDir, "fonts")
-        self.fonts = []
+        self.fonts = {}
         for f in os.listdir(os.fsencode(fontDir)):
             filename = os.fsdecode(f)
 
@@ -34,12 +34,14 @@ class DrawText:
             offset = 0
             if filename == "iv18x16u.bdf":
                 offset = 6
+            elif filename == "ib8x8u.bdf":
+                offset = 10
 
             data = (font, offset, {})
-            self.fonts.append(data)
+            self.fonts[filename[:-4]] = data
 
-    def getGlyph(self, c):
-        f, o, cache = self.fonts[0] # TODO selection of fonts
+    def getGlyph(self, c, font):
+        f, o, cache = self.fonts[font]
 
         # only render glyphs once, cache resulting image data
         if not c in cache:
@@ -70,7 +72,7 @@ class DrawText:
                 p = g.getpixel((x, y))
                 self.gui.set_pixel(xTarget, yOff + y, p)
 
-    def text(self, s, offset = 0, earlyAbort = True):
+    def text(self, s, f, offset = 0, earlyAbort = True, yOff = 0):
         w = 0
         for c in s:
             xOff = -offset + w
@@ -78,22 +80,23 @@ class DrawText:
                 if xOff >= self.gui.width:
                     break
 
-            g, y = self.getGlyph(c)
+            g, y = self.getGlyph(c, f)
             w += g.width
 
             if xOff >= -10: # some wiggle room so chars dont disappear
-                self.drawGlyph(g, xOff, y)
+                self.drawGlyph(g, xOff, y + yOff)
         return w
-import sys
+
 class ScrollText:
-    def __init__(self, g, t, i = 1, s = 75):
+    def __init__(self, g, t, f, i = 1, s = 75):
         self.gui = g
         self.drawer = DrawText(self.gui)
         self.text = t
+        self.font = f
         self.iterations = i
         self.speed = 1.0 / s
 
-        self.width = self.drawer.text(self.text, 0, False)
+        self.width = self.drawer.text(self.text, self.font, 0, False)
         self.restart()
 
     def restart(self):
@@ -113,11 +116,12 @@ class ScrollText:
                 self.offset = -self.gui.width
                 self.count += 1
 
-        self.drawer.text(self.text, self.offset, True)
+        self.drawer.text(self.text, self.font, self.offset, True)
 
 if __name__ == "__main__":
     import util
     t = util.getTarget()
 
-    d = ScrollText(t, "This is a long scrolling text. Is it too fast or maybe too slow?")
+    #d = ScrollText(t, "This is a long scrolling text. Is it too fast or maybe too slow?", "iv18x16u")
+    d = ScrollText(t, "This is a long scrolling text. Is it too fast or maybe too slow?", "ib8x8u")
     t.debug_loop(d.draw)

manager.py

@@ -63,19 +63,19 @@ if __name__ == "__main__":
 
     m = Manager(t)
 
-    m.add(ScrollText(t, "This appears once"))
+    m.add(ScrollText(t, "This appears once", "ib8x8u"))
     m.add(Solid(t, 1.0))
 
-    m.add(ScrollText(t, "And this twice...", 2))
+    m.add(ScrollText(t, "And this twice...", "ib8x8u", 2))
     m.add(Solid(t, 1.0))
 
     m.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), 20.0, True))
     m.add(Solid(t, 1.0))
 
     sub = Manager(t)
-    sub.add(ScrollText(t, "Hello"))
+    sub.add(ScrollText(t, "Hello", "ib8x8u"))
     sub.add(Solid(t, 1.0, (0, 255, 0)))
-    sub.add(ScrollText(t, "World"))
+    sub.add(ScrollText(t, "World", "ib8x8u"))
     sub.add(Solid(t, 1.0, (0, 0, 255)))
     m.add(sub)
     m.add(Solid(t, 1.0))

net.py

@@ -63,7 +63,7 @@ if __name__ == "__main__":
     t = util.getTarget()
 
     d = CheckHTTP("http://xythobuz.de")
-    d.success(ScrollText(t, "Success"))
-    d.fail(ScrollText(t, "Failure"))
+    d.success(ScrollText(t, "Success", "ib8x8u"))
+    d.fail(ScrollText(t, "Failure", "ib8x8u"))
 
     t.debug_loop(d.draw)

qr.py

@@ -10,11 +10,13 @@
 import time
 import qrcode
 import util
+from draw import DrawText
 
 class QRScreen:
-    def __init__(self, g, d, t = 10.0, c1 = (0, 0, 0), c2 = (255, 255, 255)):
+    def __init__(self, g, d, t = 10.0, h = None, c1 = (0, 0, 0), c2 = (255, 255, 255)):
         self.gui = g
         self.time = t
+        self.heading = h
         self.c1 = c1
         self.c2 = c2
 
@@ -33,6 +35,9 @@ class QRScreen:
         else:
             self.image = qr.make_image(fill_color = self.c1, back_color = self.c2)
 
+        if self.heading != None:
+            self.text = DrawText(self.gui)
+
         self.xOff = int((self.gui.width - self.image.width) / 2)
         self.yOff = int((self.gui.height - self.image.height) / 2)
 
@@ -65,9 +70,12 @@ class QRScreen:
                     v = (v, v, v)
                 self.gui.set_pixel(x + self.xOff, y + self.yOff, v)
 
+        if self.heading != None:
+            self.text.text(self.heading, "ib8x8u", 0, True, -10)
+
 if __name__ == "__main__":
     import util
     t = util.getTarget()
 
-    d = QRScreen(t, "Hello World")
+    d = QRScreen(t, "Hello World", 10.0, "Test")
     t.debug_loop(d.draw)