Skip to content

Commit 6241968

Browse files
author
Nick Shorter
committed
Added Scolling
1 parent 6b2c548 commit 6241968

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

matrix/weathermatrix.py

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ def get_temp_color(self, temp: int) -> Tuple[int, int, int]:
3636

3737
def render_temp(self, api) -> None:
3838
font: ImageFont = ImageFont.truetype("/usr/share/fonts/retro_computer.ttf", 7)
39-
self.draw_text((0, 10), "T:", font=font)
40-
self.draw_text((10, 10), f"{str(int(api.get_temp))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
41-
self.draw_text((30, 10), "R:", font=font)
42-
self.draw_text((40, 10), f"{str(int(api.get_feels_like))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
43-
self.draw_text((1,20), f"H:", font=font)
44-
self.draw_text((10, 20), f"{str(int(api.get_max_temp))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
45-
self.draw_text((30, 20), f"L:", font=font)
46-
self.draw_text((40, 20), f"{str(int(api.get_min_temp))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
39+
self.draw_text((0, 8), "T:", font=font)
40+
self.draw_text((10, 8), f"{str(int(api.get_temp))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
41+
self.draw_text((30, 8), "R:", font=font)
42+
self.draw_text((40, 8), f"{str(int(api.get_feels_like))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
43+
self.draw_text((1, 18), f"H:", font=font)
44+
self.draw_text((10, 18), f"{str(int(api.get_max_temp))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
45+
self.draw_text((30, 18), f"L:", font=font)
46+
self.draw_text((40, 18), f"{str(int(api.get_min_temp))}F", font=font, fill=self.get_temp_color(int(api.get_temp)))
4747

4848
def render_icon(self, api: Weather) -> None:
4949
font: ImageFont = ImageFont.truetype("/usr/share/fonts/weathericons.ttf", 9)
@@ -112,19 +112,31 @@ def render_time(self, api: Weather) -> None:
112112
self.draw_text((7, 23), sunrise, font=font)
113113
self.draw_text((35, 18), "\uf044", font=ImageFont.truetype("/usr/share/fonts/weathericons.ttf", 11), fill=(255, 145, 0))
114114
self.draw_text((40, 23), sunset, font=font)
115-
115+
def render_conditions(self, api: Weather, xpos: int) -> None:
116+
self.draw_text((-xpos, 26), f"Conditions: {api.get_conditions}", font=ImageFont.truetype("/usr/share/fonts/04B_03B_.TTF", 8), fill=(255,255,255))
116117
async def render(self, api: Weather, loop) -> None:
117118
self.logger.info("Rendering Weather Matrix")
118119
self.logger.debug("Clearing Image")
119120
self.clear()
120121
self.logger.debug("Reloading Image in matrix")
122+
xpos = 0
123+
self.logger.info("Loading Screen 1 of Matrix")
124+
while xpos < 100:
125+
self.reload_image()
126+
self.render_temp(api)
127+
self.render_icon(api)
128+
self.render_location(api)
129+
self.render_conditions(api, xpos)
130+
xpos += 1
131+
await self.render_image()
132+
time.sleep(3) if xpos == 1 else time.sleep(.05)
121133
self.reload_image()
122134
self.render_temp(api)
123135
self.render_icon(api)
124136
self.render_location(api)
125-
self.logger.info("Loading Screen 1 of Matrix")
137+
self.render_conditions(api, 0)
126138
await self.render_image()
127-
time.sleep(30)
139+
time.sleep(25)
128140
self.clear()
129141
self.logger.debug("Reloading Image in matrix")
130142
self.reload_image()

0 commit comments

Comments
 (0)