From 09bf090f8380cdcb02247f2843776261d526158f Mon Sep 17 00:00:00 2001
From: Tom Ward <tomwardio@gmail.com>
Date: Mon, 15 Jan 2024 22:48:34 +0000
Subject: [PATCH] Add fast train icon to indicate which trains are fast or not.

This also adds initial support for rendering glyphs, though generating the python files is a little finicky as it stands.

This will only show if "slow_stations" are provided.
---
 assets/fast_icon.png          | Bin 0 -> 1252 bytes
 manifest.py                   |   1 +
 src/assets/__init__.py        |   4 ++-
 src/assets/fast_train_icon.py |  23 +++++++++++++++
 src/glyphs.py                 |  54 ++++++++++++++++++++++++++++++++++
 src/main.py                   |   3 +-
 src/widgets.py                |  13 +++++++-
 7 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 assets/fast_icon.png
 create mode 100644 src/assets/fast_train_icon.py
 create mode 100644 src/glyphs.py

diff --git a/assets/fast_icon.png b/assets/fast_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b77c8c4332f414bdde52d20356b80bd102ba7a72
GIT binary patch
literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq000jF000OG1^@s6Cex+z000CIX+uL$YePpv
zZ)|UJQ*dEpWk+RhWpZg_Qb$4n062|}Rb6NtRTMs(xw9)I&V$sZrjic+HI%e$QqhFk
z=>BE1ZQLxAY_vg;$?V;oX(lt{{G@3qJ`_O^!KmPq;Qw2}Cn0L9?Tam<v{0f1gDCjW
z`bVMC7YXaRGqbysxNE)3-1+95?|$drbMD>?khm;cmfj@-EE=vY<<sJ`$L7SuI&{H(
z&<%aiEh~<dDwQSy8{@*i+U@Tk#@^TVxA*^N>#k5o0f^m&*sM6pBI0EL{uRZtU4R5Z
z`^X8`V)zNfJ8YaF;u6EP09P2E5Ad?jnUOMxUqvh^s*L``+lU9}BlcPZ2XpY-jyyG}
zttleQMaed+noc9ry@UIIwng1*#M^^UkFzj+6yF25_LnMhmf?pGpH<}CbcnAmX|u%;
z|7E#p3GpKUUAw%6atiT2#A8)^yd3Cssj4^8z$>TJnP(8+gLrkpJj%xIMEtceUz`ec
zeo~wa<_{hK;NmJRuzL3+9<WVmDu~OCS7<iJ@`(7j<`!lGeeNx1X*$=?Ii+TbK`icz
z<MI(!r#{42sh*cY{a-D&6vibzhF+WubjUDu{Pp^FSDl#%;*vQR3mS|iFIKhjLdbtt
zwI`$yU$%6AkK)|OP1}>o0iVC08s$)vACv7|KExH6jmbd4gn8^0FkllzkRT6fd|P0n
zrwSVAXrbt(XrcJk;OyVRDf#{Yw^VBW$m{6QFhZvPBk<6w!tZERBfJcLd1$M3&<SR6
zBh)cTFG-Sv_#7gW<S-c_qacze$x~#EWYIcG4mHP?B6DQ(xzW^l0V7hMH;cTB=yyTJ
z{%2&E;Iz-hN}o3n*w5I{Ys!_^ZeBWlZdZ%DMpmD@)^q7}Bxf3GEp*7*)SYtA|H5DA
z*RWsbH(Ct-2Yv&8>)TehHS09YRtkN(Z(GDi^F2;vKBX;HY+<vbqFFUo`T`%z0DZZ5
zy9j3nTm0nr$v={7$@h{UCV%7J<UZlfbDwgbao>Q*UEnTqUvgh@A9J5aYSek}G;8j!
zqp=F+X_rylpF&#LEj%b>g+0Q<!emQN=oN;931KgKb~mdNjTc?J2FI{(WUGCwfETHA
z>~5^H*5N-?MwSLAe5T{?GXqX;<AftgKN%v0ZM%Ae?e(U1eoH;tuYtyM@oYQ=VtikG
zG(HqR!f=Bb-;2Ic?D5oc>9WfX;*4pXw6&V*io?m|<6;W0GAb4f<-njQ>$>Q>9MPr@
zwU=n+0I+*9IKpp9{{0u*d8K7@p9VPmCp-6AwmA>rtOL;dXv;Q$XXCx^0IWWyc=l3w
zC&Xgk0yx!!!@*Zi8qcdA>-AfBZYACT*nGWS|NH%Vee(m<-vGFv{{#Oecnig2*2@3@
z061k>NoGw=04e|g00;m9hiL!=000010000Q0000000N)_00aO40096101u!800aO4
z0096100;m8005TWB_jX;08L3mK~xwSjgG+%03ZlLW9$Eax$=Nx#-?7%0v<ST)?fg9
zs(5M5ny(>nWEH59X#TfkXU>pGZHo1b(Cw00OU3Tq)~+UnS#mYhoy{)uuOR^X7aP0)
O0000<MNUMnLSTaXhf$9J

literal 0
HcmV?d00001

diff --git a/manifest.py b/manifest.py
index 4c32647..f05d19a 100644
--- a/manifest.py
+++ b/manifest.py
@@ -28,6 +28,7 @@
 module('display.py', base_path='src')
 module('epd29b.py', base_path='src')
 module('fonts.py', base_path='src')
+module('glyphs.py', base_path='src')
 module('logging.py', base_path='src')
 module('main.py', base_path='src')
 module('ssd1322.py', base_path='src')
diff --git a/src/assets/__init__.py b/src/assets/__init__.py
index 5985316..835bf3b 100644
--- a/src/assets/__init__.py
+++ b/src/assets/__init__.py
@@ -23,4 +23,6 @@
 
 from . import dot_matrix_regular
 from . import dot_matrix_bold
-from . import dot_matrix_bold_tall
\ No newline at end of file
+from . import dot_matrix_bold_tall
+
+from . import fast_train_icon
\ No newline at end of file
diff --git a/src/assets/fast_train_icon.py b/src/assets/fast_train_icon.py
new file mode 100644
index 0000000..a1eb400
--- /dev/null
+++ b/src/assets/fast_train_icon.py
@@ -0,0 +1,23 @@
+# Code generated by data_to_py.py.
+version = '0.1'
+
+_data =\
+b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00'\
+b'\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\x00\xff\xff'\
+b'\xff\xff\xff\x00\x00\x00\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00'\
+b'\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00'\
+b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff'\
+b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x00\x00\x00\x00\x00\x00'\
+b'\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'\
+b'\xff\xff\xff\xff\xff\xff\x00\x00'
+
+_mvdata = memoryview(_data)
+
+def data():
+    return _mvdata
+
+def width():
+    return 15
+
+def height():
+    return 8
\ No newline at end of file
diff --git a/src/glyphs.py b/src/glyphs.py
new file mode 100644
index 0000000..57b641b
--- /dev/null
+++ b/src/glyphs.py
@@ -0,0 +1,54 @@
+# Copyright (c) 2024 Tom Ward
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""Icons class that wraps up a font_to_python module."""
+
+import framebuf
+import uctypes
+
+import assets
+
+
+class Glyph:
+  """Helper class that wraps data_to_py module.
+
+  Provides helper functions for rendering glyphs into a given display."""
+
+  def __init__(self, glyph):
+    self._glyph = glyph
+    self._framebuf = framebuf.FrameBuffer(
+        uctypes.bytearray_at(
+            uctypes.addressof(glyph.data()), len(glyph.data())
+        ),
+        glyph.width(),
+        glyph.height(),
+        framebuf.GS8,
+    )
+
+  def render_glyph(
+      self, framebuffer: framebuf.FrameBuffer, x: int, y: int
+  ) -> None:
+    """Renders glyph into the provided display at position [x, y]."""
+    framebuffer.blit(self._framebuf, x, y, -1)
+
+  def max_bounds(self) -> tuple[int, int]:
+    """Returns the max bounds for Glyph."""
+    return self._glyph.width(), self._glyph.height()
+
+
+FAST_TRAIN_ICON = Glyph(assets.fast_train_icon)
diff --git a/src/main.py b/src/main.py
index c0d24bd..073cd68 100644
--- a/src/main.py
+++ b/src/main.py
@@ -34,9 +34,9 @@
 import config as config_module
 import display
 import fonts
+import glyphs
 import logging
 from setup import server
-import time_range
 import trains
 import utils
 import widgets
@@ -132,6 +132,7 @@ def _render_thread(
         fonts.DEFAULT_FONT,
         # Don't render seconds on e-paper displays.
         render_seconds=(config.display.type != 'epd29b'),
+        fast_train_icon=glyphs.FAST_TRAIN_ICON,
     )
     non_active = widgets.MessageWidget(
         screen, _DISPLAY_NOT_ACTIVE, fonts.DEFAULT_FONT
diff --git a/src/widgets.py b/src/widgets.py
index 636da5e..e203c6f 100644
--- a/src/widgets.py
+++ b/src/widgets.py
@@ -20,6 +20,7 @@
 
 import display
 import fonts
+import glyphs
 import trains
 
 
@@ -163,19 +164,24 @@ def __init__(
       font: fonts.Font,
       width: int,
       status_font: fonts.Font | None = None,
+      fast_train_icon: glyphs.Glyph | None = None,
   ):
     super().__init__(screen)
     self._font = font
     self._width = width
     self._status_font = status_font if status_font else font
+    self._fast_train_icon = fast_train_icon
     self._max_clock_width = self._font.calculate_bounds('00:00')[0]
 
     self._last_departure = None
 
   def bounds(self) -> tuple[int, int]:
-    return self._width, max(
+    max_height = max(
         self._font.max_bounds()[1], self._status_font.max_bounds()[1]
     )
+    if self._fast_train_icon:
+      max_height = max(max_height, self._fast_train_icon.max_bounds()[1])
+    return self._width, max_height
 
   def render(
       self, departure: trains.Departure | None, x: int, y: int, w: int, h: int
@@ -193,6 +199,9 @@ def render(
     self._font.render_text(departure_time, self._screen, x, y)
 
     x += self._max_clock_width + 4
+    if departure.fast_train and self._fast_train_icon:
+      self._fast_train_icon.render_glyph(self._screen, x, y)
+      x += self._fast_train_icon.max_bounds()[0] + 2
     self._font.render_text(departure.destination, self._screen, x, y)
 
     if departure.cancelled:
@@ -220,6 +229,7 @@ def __init__(
       tall_font: fonts.Font,
       default_font: fonts.Font,
       render_seconds: bool = True,
+      fast_train_icon: glyphs.Glyph | None = None,
   ):
     super().__init__(screen)
     self._departure_updater = departure_updater
@@ -244,6 +254,7 @@ def __init__(
               bold_font if i == 0 else default_font,
               screen.width,
               default_font,
+              fast_train_icon,
           )
       )