glyph caching

draw.py

@@ -28,21 +28,27 @@ class DrawText:
             if filename == "iv18x16u.bdf":
                 offset = 6
 
-            data = (font, offset)
+            data = (font, offset, {})
             self.fonts.append(data)
 
     def getGlyph(self, c):
-        f, o = self.fonts[0] # TODO selection of fonts
-        g = f.glyph(c).draw()
+        f, o, cache = self.fonts[0] # TODO selection of fonts
 
-        # invert color
-        g = g.replace(1, 2).replace(0, 1).replace(2, 0)
+        # only render glyphs once, cache resulting image data
+        if not c in cache:
+            g = f.glyph(c).draw()
 
-        # render to pixel data
-        img = Image.frombytes('RGBA',
-                              (g.width(), g.height()),
-                              g.tobytes('RGBA'))
-        return (img, o)
+            # invert color
+            g = g.replace(1, 2).replace(0, 1).replace(2, 0)
+
+            # render to pixel data
+            img = Image.frombytes('RGBA',
+                                (g.width(), g.height()),
+                                g.tobytes('RGBA'))
+
+            cache[c] = img
+
+        return (cache[c], o)
 
     def drawGlyph(self, g, xOff, yOff):
         for x in range(0, g.width):
@@ -97,5 +103,6 @@ if __name__ == "__main__":
     else:
         from test import TestGUI
         t = TestGUI()
+
     d = ScrollText(t, "Hello, World!")
     t.debug_loop(d.draw)

life.py

@@ -99,9 +99,12 @@ if __name__ == "__main__":
     else:
         from test import TestGUI
         t = TestGUI()
+
     g = GameOfLife(t)
+
     def helper():
         if g.finished():
             g.restart()
         g.draw()
+
     t.debug_loop(helper)

manager.py

@@ -7,6 +7,9 @@ class Manager:
         self.gui = g
         self.screens = []
         self.index = 0
+        self.restart()
+
+    def restart(self):
         self.lastTime = time.time()
 
     def add(self, s, d = None):
@@ -17,6 +20,7 @@ class Manager:
         self.screens[self.index][0].draw()
 
         if self.screens[self.index][1] == None:
+            # let screen decide when it is done
             if self.screens[self.index][0].finished():
                 self.index = (self.index + 1) % len(self.screens)
                 self.lastTime = time.time()
@@ -61,4 +65,5 @@ if __name__ == "__main__":
     m.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), 20.0))
     m.add(Solid(t, 1.0))
 
+    m.restart()
     t.debug_loop(m.loop)

solid.py

@@ -29,5 +29,6 @@ if __name__ == "__main__":
     else:
         from test import TestGUI
         t = TestGUI()
-    d = ScrollText(t, "Hello, World!")
+
+    d = Solid(t, 1.0, (0, 255, 0))
     t.debug_loop(d.draw)

splash.py

@@ -33,6 +33,7 @@ if __name__ == "__main__":
     else:
         from test import TestGUI
         t = TestGUI()
+
     s = SplashScreen(t)
     s.draw()
     t.debug_loop(s.draw)

weather.py

@@ -67,6 +67,7 @@ if __name__ == "__main__":
     else:
         from test import TestGUI
         t = TestGUI()
+
     s = WeatherScreen(t)
     s.draw()
     t.debug_loop(s.draw)