more work on weather widget

README.md

@@ -55,3 +55,5 @@ The fonts from [cmvnd/fonts](https://github.com/cmvnd/fonts) are licensed as GPL
 The tiny font is from [robey](https://robey.lag.net/2010/01/23/tiny-monospace-font.html) and licensed as CC0.
 
 The included GIFs are from [GifCities](https://gifcities.org/?q=32).
+
+The included DWD weather API documentation is from [their website](https://www.dwd.de/DE/leistungen/opendata/hilfe.html).

image.py

@@ -25,7 +25,7 @@ from PIL import GifImagePlugin
 GifImagePlugin.LOADING_STRATEGY = GifImagePlugin.LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY
 
 class ImageScreen:
-    def __init__(self, g, p, t = 0.2, i = 1, to = 5.0, bg = None):
+    def __init__(self, g, p, t = 0.2, i = 1, to = 5.0, bg = None, target_size = None, nearest = True):
         self.gui = g
         self.time = t
         self.iterations = i
@@ -41,32 +41,38 @@ class ImageScreen:
             self.image.is_animated = False
             self.image.n_frames = 1
 
+        if target_size == None:
+            target_size = (self.gui.width, self.gui.height)
+
         # automatically crop and scale large images
-        if not self.image.is_animated and ((self.image.width > self.gui.width) or (self.image.height > self.gui.height)):
+        if not self.image.is_animated and ((self.image.width > target_size[0]) or (self.image.height > target_size[1])):
             # crop to visible area
             self.image = self.image.crop(self.image.getbbox())
 
             # keep the aspect ratio and fit within visible area
             ratio = self.image.width / self.image.height
-            max_width = int(ratio * self.gui.height)
-            max_height = int(self.gui.width / ratio)
-            if (max_height >= self.gui.height) or (((self.gui.width - max_width) < (self.gui.height - max_height)) and ((self.gui.width - max_width) >= 0)):
+            max_width = int(ratio * target_size[1])
+            max_height = int(target_size[0] / ratio)
+            if (max_height >= target_size[1]) or (((target_size[0] - max_width) < (target_size[1] - max_height)) and ((target_size[0] - max_width) >= 0)):
                 width = max_width
-                height = self.gui.height
+                height = target_size[1]
             else:
-                width = self.gui.width
+                width = target_size[0]
                 height = max_height
 
             # resize
-            self.image = self.image.resize((width, height),
-                                           Image.Resampling.NEAREST)
+            if nearest:
+                self.image = self.image.resize((width, height),
+                                            Image.Resampling.NEAREST)
+            else:
+                self.image = self.image.resize((width, height))
 
             # new image object is also missing these
             self.image.is_animated = False
             self.image.n_frames = 1
 
         # enlarge small images
-        if not self.image.is_animated and ((self.image.width * 2) <= self.gui.width) and ((self.image.height * 2) <= self.gui.height):
+        if not self.image.is_animated and ((self.image.width * 2) <= target_size[0]) and ((self.image.height * 2) <= target_size[1]):
             self.image = self.image.crop(self.image.getbbox())
             self.image = self.image.resize((self.image.width * 2, self.image.height * 2),
                                            Image.Resampling.NEAREST)
@@ -133,10 +139,11 @@ if __name__ == "__main__":
     import sys
 
     import util
-    t = util.getTarget()
+    i = util.getInput()
+    t = util.getTarget(i)
 
     from manager import Manager
-    m = Manager(t)
+    m = Manager(t, i)
 
     scriptDir = os.path.dirname(os.path.realpath(__file__))
     imageDir = os.path.join(scriptDir, "images")

livingroom.py

@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+
+# ----------------------------------------------------------------------------
+# "THE BEER-WARE LICENSE" (Revision 42):
+# <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+# you can do whatever you want with this stuff. If we meet some day, and you
+# think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+# ----------------------------------------------------------------------------
+
+camp_pink = (251, 72, 196)
+camp_green = (63, 255, 33)
+
+from splash import SplashScreen
+from scroll import ScrollText
+from solid import Solid
+from life import GameOfLife
+from net import CheckHTTP
+from image import ImageScreen
+from qr import QRScreen
+from snake import Snake
+from gamepad import InputWrapper
+from manager import Manager
+from tetris import Tetris
+from breakout import Breakout
+from weather import WeatherScreen
+from config import Config
+import util
+
+# Need to import InputWrapper before initializing RGB Matrix on Pi
+i = util.getInput()
+t = util.getTarget(i)
+
+# Loading fonts and graphics takes a while.
+# So show a splash screen while the user waits.
+splash = SplashScreen(t)
+t.loop_start()
+splash.draw()
+t.loop_end()
+
+m = Manager(t, i)
+
+m.add(ImageScreen(t, "cann.png"))
+m.add(Solid(t, 1.0))
+
+m.add(WeatherScreen(t, i, Config.weather_latlon))
+m.add(Solid(t, 1.0))
+
+m.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), None, 2.0))
+m.add(Solid(t, 1.0))
+
+m.add(ImageScreen(t, "cann2.png"))
+m.add(Solid(t, 1.0))
+
+m.add(ImageScreen(t, "earth.gif"))
+m.add(Solid(t, 1.0))
+
+#m.add(Breakout(t, i))
+#m.add(Solid(t, 1.0))
+
+#m.add(Tetris(t, i,))
+#m.add(Solid(t, 1.0))
+
+#m.add(Snake(t, i, camp_pink, camp_green))
+#m.add(Solid(t, 1.0))
+
+m.restart()
+util.loop(t, m.draw)

tools/convert.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+
+# Requires openpyxl and openpyxl_image_loader.
+#
+# ----------------------------------------------------------------------------
+# "THE BEER-WARE LICENSE" (Revision 42):
+# <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+# you can do whatever you want with this stuff. If we meet some day, and you
+# think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+# ----------------------------------------------------------------------------
+
+import sys
+from openpyxl import load_workbook
+from openpyxl_image_loader import SheetImageLoader
+
+if __name__ != "__main__":
+    raise RuntimeError("Please run this file directly")
+
+if len(sys.argv) < 2:
+    raise RuntimeError("Please pass input file as argument")
+
+wb = load_workbook(filename = sys.argv[1])
+ws = wb.active
+image_loader = SheetImageLoader(ws)
+
+data = []
+
+for row in ws:
+    try:
+        id = int(row[0].value)
+    except:
+        continue
+
+    text = str(row[1].value)
+    #print("id={} text='{}'".format(id, text))
+
+    if not image_loader.image_in(row[2].coordinate):
+        print("No image found for ID {}".format(id))
+        image = None
+    else:
+        image = image_loader.get(row[2].coordinate)
+
+    data.append((
+        id, text, image
+    ))
+
+print("Found {} IDs:".format(len(data)))
+print()
+
+print("    self.descriptions = [")
+for d in data:
+    if d[2] != None:
+        img_name = "weather_icon_{}.png".format(d[0])
+        d[2].save(img_name)
+        img_name = "'" + img_name + "'"
+    else:
+        img_name = "None"
+    print("        ({}, '{}', {}),".format(d[0], d[1], img_name))
+print("    ]")
+print()

weather.py

@@ -8,6 +8,8 @@
 # ----------------------------------------------------------------------------
 
 import util
+from image import ImageScreen
+
 import time
 from datetime import datetime, timezone, timedelta
 
@@ -19,6 +21,13 @@ from wetterdienst.provider.dwd.mosmix import (
 )
 import polars
 
+def get_first_capitalized_word(s):
+    words = s.split()
+    for w in words:
+        if w[0].isupper():
+            return w
+    return None
+
 class WeatherScreen:
     def __init__(self, g, i, latlon, timestep = 5.0, refresh = (60.0 * 60.0)):
         self.gui = g
@@ -37,7 +46,39 @@ class WeatherScreen:
             "temperature_air_mean_200",
             "cloud_cover_effective",
         ]
-        self.num_state = len(self.params) + 1
+        self.num_state = 4
+
+        self.descriptions = [
+            (95, 'leichtes oder mäßiges Gewitter mit Regen oder Schnee', 'weather_icon_95.png'),
+            (57, 'mäßiger oder starker gefrierender Sprühregen', 'weather_icon_57.png'),
+            (56, 'leichter gefrierender Sprühregen', 'weather_icon_56.png'),
+            (67, 'mäßiger bis starker gefrierender Regen', 'weather_icon_67.png'),
+            (66, 'leichter gefrierender Regen', 'weather_icon_66.png'),
+            (86, 'mäßiger bis starker Schneeschauer', 'weather_icon_86.png'),
+            (85, 'leichter Schneeschauer', 'weather_icon_85.png'),
+            (84, 'mäßiger oder starker Schneeregenschauer', 'weather_icon_84.png'),
+            (83, 'leichter Schneeregenschauer', 'weather_icon_83.png'),
+            (82, 'äußerst heftiger Regenschauer', 'weather_icon_82.png'),
+            (81, 'mäßiger oder starker Regenschauer', 'weather_icon_81.png'),
+            (80, 'leichter Regenschauer', 'weather_icon_80.png'),
+            (75, 'durchgehend starker Schneefall', 'weather_icon_75.png'),
+            (73, 'durchgehend mäßiger Schneefall', 'weather_icon_73.png'),
+            (71, 'durchgehend leichter Schneefall', 'weather_icon_71.png'),
+            (69, 'mäßger oder starker Schneeregen', 'weather_icon_69.png'),
+            (68, 'leichter Schneeregen', 'weather_icon_68.png'),
+            (55, 'durchgehend starker Sprühregen', 'weather_icon_55.png'),
+            (53, 'durchgehend mäßiger Sprühregen', 'weather_icon_53.png'),
+            (51, 'durchgehend leichter Sprühregen', 'weather_icon_51.png'),
+            (65, 'durchgehend starker Regen', 'weather_icon_65.png'),
+            (63, 'durchgehend mäßiger Regen', 'weather_icon_63.png'),
+            (61, 'durchgehend leichter Regen', 'weather_icon_61.png'),
+            (49, 'Nebel mit Reifansatz, Himmel nicht erkennbar, unverändert', 'weather_icon_49.png'),
+            (45, 'Nebel, Himmel nicht erkennbar', 'weather_icon_45.png'),
+            (3, 'Bewölkung zunehmend', None),
+            (2, 'Bewölkung unverändert', None),
+            (1, 'Bewölkung abnehmend', None),
+            (0, 'keine Bewölkungsentwicklung', None),
+        ]
 
         self.find_station()
         self.restart()
@@ -58,10 +99,20 @@ class WeatherScreen:
             "start": False,
             "select": False,
         }
+        self.done = False
         self.last = time.time()
 
     def find_station(self):
-        settings = Settings(ts_shape=True, ts_humanize=True)
+        self.gui.loop_start()
+        self.t_head.setText("Weather:", "lemon")
+        self.t_head.draw(3, -self.gui.height / 2 + 7)
+        self.t_sub.setText("Loading...", "tom-thumb")
+        self.t_sub.draw(0, -self.gui.height / 2 + 5 + 6 * 4)
+        self.t_val.setText("Station...", "tom-thumb")
+        self.t_val.draw(0, -self.gui.height / 2 + 5 + 6 * 6)
+        self.gui.loop_end()
+
+        settings = Settings(ts_shape=True, ts_humanize=True, cache_disable=False)
         request = DwdMosmixRequest(
             parameter=self.params,
             start_issue=DwdForecastDate.LATEST,
@@ -83,7 +134,16 @@ class WeatherScreen:
         self.parse_forecast()
 
     def get_forecast(self):
-        settings = Settings(ts_shape=True, ts_humanize=True)
+        self.gui.loop_start()
+        self.t_head.setText("Weather:", "lemon")
+        self.t_head.draw(3, -self.gui.height / 2 + 7)
+        self.t_sub.setText("Loading...", "tom-thumb")
+        self.t_sub.draw(0, -self.gui.height / 2 + 5 + 6 * 4)
+        self.t_val.setText("Refresh...", "tom-thumb")
+        self.t_val.draw(0, -self.gui.height / 2 + 5 + 6 * 6)
+        self.gui.loop_end()
+
+        settings = Settings(ts_shape=True, ts_humanize=True, cache_disable=False)
         request = DwdMosmixRequest(
             parameter=self.params,
             start_issue=DwdForecastDate.LATEST,
@@ -94,6 +154,15 @@ class WeatherScreen:
         self.parse_forecast()
 
     def parse_forecast(self):
+        self.gui.loop_start()
+        self.t_head.setText("Weather:", "lemon")
+        self.t_head.draw(3, -self.gui.height / 2 + 7)
+        self.t_sub.setText("Parsing", "tom-thumb")
+        self.t_sub.draw(0, -self.gui.height / 2 + 5 + 6 * 4)
+        self.t_val.setText("Forecast", "tom-thumb")
+        self.t_val.draw(0, -self.gui.height / 2 + 5 + 6 * 6)
+        self.gui.loop_end()
+
         self.last_forecast = time.time()
 
         response = next(self.forecast.values.query())
@@ -116,14 +185,14 @@ class WeatherScreen:
         if keys["up"] and (not self.old_keys["up"]) and (not self.old_keys["select"]):
             self.state = (self.state + 1) % self.num_state
             self.last = time.time()
-        elif keys["down"] and (not self.old_keys["select"]):
+        elif keys["down"] and (not self.old_keys["down"]) and (not self.old_keys["select"]):
             self.state = (self.state - 1) % self.num_state
             self.last = time.time()
 
         self.old_keys = keys.copy()
 
     def finished(self):
-        return False # TODO
+        return self.done
 
     def draw_station_info(self):
         # heading
@@ -152,9 +221,41 @@ class WeatherScreen:
         self.t_head.setText("Weather:", "lemon")
         self.t_head.draw(3, -self.gui.height / 2 + 7)
 
+        # convert weather id
         val = self.data.filter(polars.col("parameter") == self.params[0])[0]["value"][0]
-        self.t_val.setText("{:.0f}".format(val), "tom-thumb")
-        self.t_val.draw(0, -self.gui.height / 2 + 5 + 6 * 5)
+        name = "ID {} Unknown".format(val)
+        img = None
+        for i, d in enumerate(self.descriptions):
+            if d[0] != val:
+                continue
+
+            if isinstance(d[2], str):
+                w = 50
+                target_size = (w, w)
+                iscr = ImageScreen(self.gui, d[2], 0.2, 1, 5.0, None, target_size, False)
+                self.descriptions[i] = (d[0], d[1], iscr)
+                iscr.xOff = (self.gui.width - w) / 2
+                iscr.yOff = self.gui.height - w + 5
+                img = iscr
+            else:
+                img = d[2]
+
+            name = get_first_capitalized_word(d[1])
+
+        # print weather description text
+        self.t_sub.setText(name, "tom-thumb")
+        self.t_sub.draw(0, -self.gui.height / 2 + 5 + 6 * 1 + 2)
+        #self.t_sub.draw(0, -self.gui.height / 2 + 5 + 6 * 2)
+        #self.t_sub.draw(self.gui.width, -self.gui.height / 2 + 5 + 6 * 3)
+        #self.t_sub.draw(self.gui.width * 2, -self.gui.height / 2 + 5 + 6 * 4)
+
+        # show image if it exists
+        if img != None:
+            img.draw()
+
+        # id of weather / image
+        self.t_aux.setText("{}".format(int(val)), "tom-thumb")
+        self.t_aux.draw(0, -self.gui.height / 2 + 5 + 6 * 9 + 3)
 
     def draw_temperature(self):
         # heading
@@ -171,8 +272,10 @@ class WeatherScreen:
 
     def draw_cloud_cover(self):
         # heading
-        self.t_head.setText("Clouds:", "lemon")
+        self.t_head.setText("Cloud", "lemon")
         self.t_head.draw(3, -self.gui.height / 2 + 7)
+        self.t_sub.setText("Coverage:", "lemon")
+        self.t_sub.draw(3, -self.gui.height / 2 + 20)
 
         val = self.data.filter(polars.col("parameter") == self.params[2])[0]["value"][0]
         self.t_val.setText("{:.1f} %".format(val), "tom-thumb")
@@ -196,13 +299,15 @@ class WeatherScreen:
         # advance to next screen after time has passed
         if (time.time() - self.last) >= self.timestep:
             self.state = (self.state + 1) % self.num_state
+            if self.state == 0:
+                self.done = True
             self.last = time.time()
 
         # draw progress bar on bottom most row
         elapsed = (time.time() - self.last)
         ratio = elapsed / self.timestep
-        for i in range(0, int(ratio * self.gui.width)):
-            self.gui.set_pixel(i, self.gui.height - 1, (255, 0, 0))
+        for i in range(0, int(ratio * self.gui.width) + 1):
+            self.gui.set_pixel(i, self.gui.height - 1, (0, 255, 0))
 
 if __name__ == "__main__":
     from config import Config
@@ -210,5 +315,5 @@ if __name__ == "__main__":
     i = util.getInput()
     t = util.getTarget(i)
 
-    s = WeatherScreen(t, i, Config.weather_latlon, 2.0, 60.0 * 10.0)
+    s = WeatherScreen(t, i, Config.weather_latlon, 5.0, 60.0 * 10.0)
     util.loop(t, s.draw)