rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-11 13:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rearrange current weather display layout

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-17 17:52:45 -05:00
parent c4d976ab0d
commit 00d51dea72
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/weather_manager.py
View File

@@ -227,48 +227,50 @@ class WeatherManager:
image = Image.new('RGB', (self.display_manager.matrix.width, self.display_manager.matrix.height)) image = Image.new('RGB', (self.display_manager.matrix.width, self.display_manager.matrix.height))
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
# Draw weather condition icon and text at the top # --- Top Left: Icon ---
condition = weather_data['weather'][0]['main'] condition = weather_data['weather'][0]['main']
icon_y = 1 # Adjusted y position icon_size = self.ICON_SIZE['large'] # Currently 28
icon_x = (self.display_manager.matrix.width - self.ICON_SIZE['large']) // 2 # Center horizontally icon_x = 1 # Small padding from left edge
WeatherIcons.draw_weather_icon(image, condition, icon_x, icon_y, size=self.ICON_SIZE['large']) icon_y = 1 # Small padding from top edge
WeatherIcons.draw_weather_icon(image, condition, icon_x, icon_y, size=icon_size)
# Draw condition text next to icon (using small font) # --- Top Right: Condition Text ---
condition_text = condition condition_text = condition
draw.text((icon_x + self.ICON_SIZE['large'] + 3, icon_y), # Increased padding from 1 to 3 condition_font = self.display_manager.small_font
condition_text_width = draw.textlength(condition_text, font=condition_font)
condition_x = self.display_manager.matrix.width - condition_text_width - 1 # Align right
condition_y = 1 # Align top
draw.text((condition_x, condition_y),
condition_text, condition_text,
font=self.display_manager.small_font, font=condition_font,
fill=self.COLORS['text']) fill=self.COLORS['text'])
# Draw "time ago" text below condition (using small font) # --- Right Side (Below Condition): Current Temp ---
# time_since_update = int((time.time() - self.last_update) / 3600) # hours
# time_text = f"{time_since_update}h" # Even shorter text
# draw.text((icon_x + self.ICON_SIZE['large'] + 1, icon_y + 7), # Reduced from 8
# time_text,
# font=self.display_manager.small_font,
# fill=self.COLORS['dim']) # Using dimmer color
# Draw current temperature on the right (using small font instead of regular)
temp = round(weather_data['main']['temp']) temp = round(weather_data['main']['temp'])
temp_text = f"{temp}°" # Shortened to just degrees temp_text = f"{temp}°"
temp_width = draw.textlength(temp_text, font=self.display_manager.small_font) temp_font = self.display_manager.small_font # Using small font
temp_x = self.display_manager.matrix.width - temp_width - 1 # Reduced right margin temp_text_width = draw.textlength(temp_text, font=temp_font)
draw.text((temp_x, 1), temp_x = self.display_manager.matrix.width - temp_text_width - 1 # Align right
temp_y = condition_y + 8 # Position below condition text (adjust 8 based on font size)
draw.text((temp_x, temp_y),
temp_text, temp_text,
font=self.display_manager.small_font, # Changed from regular to small font=temp_font,
fill=self.COLORS['highlight']) fill=self.COLORS['highlight'])
# Draw high/low temperatures below current temp (using small font) # --- Right Side (Below Current Temp): High/Low Temp ---
temp_max = round(weather_data['main']['temp_max']) temp_max = round(weather_data['main']['temp_max'])
temp_min = round(weather_data['main']['temp_min']) temp_min = round(weather_data['main']['temp_min'])
high_low_text = f"{temp_min}°/{temp_max}°" # Swapped order: low/high high_low_text = f"{temp_min}°/{temp_max}°"
high_low_width = draw.textlength(high_low_text, font=self.display_manager.small_font) high_low_font = self.display_manager.small_font # Using small font
draw.text((self.display_manager.matrix.width - high_low_width - 1, 9), high_low_width = draw.textlength(high_low_text, font=high_low_font)
high_low_x = self.display_manager.matrix.width - high_low_width - 1 # Align right
high_low_y = temp_y + 8 # Position below current temp text (adjust 8 based on font size)
draw.text((high_low_x, high_low_y),
high_low_text, high_low_text,
font=self.display_manager.small_font, font=high_low_font,
fill=self.COLORS['dim']) fill=self.COLORS['dim'])
# Draw additional weather metrics spaced evenly in thirds at the bottom # --- Bottom: Additional Metrics (Unchanged) ---
display_width = self.display_manager.matrix.width display_width = self.display_manager.matrix.width
section_width = display_width // 3 section_width = display_width // 3
y_pos = self.display_manager.matrix.height - 7 # Position near bottom for 6px font y_pos = self.display_manager.matrix.height - 7 # Position near bottom for 6px font