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

Reposition temperatures to bottom of screen in weather displays: - Move hourly forecast temperatures to bottom - Position daily forecast high/low temps at bottom - Improve vertical spacing and layout - Maintain consistent padding between sections

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-12 21:04:43 -05:00
parent f7cc05c05b
commit 17b9e97ddc
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/weather_manager.py
View File

@@ -313,7 +313,7 @@ class WeatherManager:
# Check if state has changed # Check if state has changed
current_state = self._get_hourly_state() current_state = self._get_hourly_state()
if not force_clear and current_state == self.last_hourly_state: if not force_clear and current_state == self.last_hourly_state:
return # No need to redraw if nothing changed return
# Clear the display # Clear the display
self.display_manager.clear() self.display_manager.clear()
@@ -322,18 +322,19 @@ 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)
# Calculate layout # Calculate layout based on matrix dimensions
hours_to_show = min(4, len(self.hourly_forecast)) # Show up to 4 hours hours_to_show = min(4, len(self.hourly_forecast))
section_width = self.display_manager.matrix.width // hours_to_show total_width = self.display_manager.matrix.width
section_width = total_width // hours_to_show
padding = max(2, section_width // 6) # Increased padding for more space
for i in range(hours_to_show): for i in range(hours_to_show):
forecast = self.hourly_forecast[i] forecast = self.hourly_forecast[i]
x = i * section_width x = i * section_width + padding
center_x = x + section_width // 2 center_x = x + (section_width - 2 * padding) // 2
# Draw hour at top - using extra small font # Draw hour at top
hour_text = forecast['hour'] hour_text = forecast['hour']
# Simplify time format
hour_text = hour_text.replace(":00 ", "").replace("PM", "p").replace("AM", "a") hour_text = hour_text.replace(":00 ", "").replace("PM", "p").replace("AM", "a")
hour_width = draw.textlength(hour_text, font=self.display_manager.small_font) hour_width = draw.textlength(hour_text, font=self.display_manager.small_font)
draw.text((center_x - hour_width // 2, 1), draw.text((center_x - hour_width // 2, 1),
@@ -341,18 +342,17 @@ class WeatherManager:
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['extra_dim']) fill=self.COLORS['extra_dim'])
# Draw weather icon in middle - made smaller and centered # Draw weather icon in middle
icon_size = self.ICON_SIZE['medium'] icon_size = self.ICON_SIZE['medium']
icon_y = 6 # Adjusted for better spacing with temperature below icon_y = self.display_manager.matrix.height // 3 # Position icon in upper third
icon_x = center_x - icon_size // 2 icon_x = center_x - icon_size // 2
# Draw weather icon using WeatherIcons class
WeatherIcons.draw_weather_icon(draw, forecast['condition'], icon_x, icon_y, icon_size) WeatherIcons.draw_weather_icon(draw, forecast['condition'], icon_x, icon_y, icon_size)
# Draw temperature below icon # Draw temperature at bottom
temp_text = f"{forecast['temp']}°" temp_text = f"{forecast['temp']}°"
temp_width = draw.textlength(temp_text, font=self.display_manager.small_font) temp_width = draw.textlength(temp_text, font=self.display_manager.small_font)
draw.text((center_x - temp_width // 2, icon_y + icon_size + 1), temp_y = self.display_manager.matrix.height - 8 # Position at bottom with small margin
draw.text((center_x - temp_width // 2, temp_y),
temp_text, temp_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['text']) fill=self.COLORS['text'])
@@ -375,7 +375,7 @@ class WeatherManager:
# Check if state has changed # Check if state has changed
current_state = self._get_daily_state() current_state = self._get_daily_state()
if not force_clear and current_state == self.last_daily_state: if not force_clear and current_state == self.last_daily_state:
return # No need to redraw if nothing changed return
# Clear the display # Clear the display
self.display_manager.clear() self.display_manager.clear()
@@ -384,35 +384,36 @@ 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)
# Calculate layout # Calculate layout based on matrix dimensions
days_to_show = min(4, len(self.daily_forecast)) # Show up to 4 days days_to_show = min(4, len(self.daily_forecast))
section_width = self.display_manager.matrix.width // days_to_show total_width = self.display_manager.matrix.width
section_width = total_width // days_to_show
padding = max(2, section_width // 6) # Increased padding for more space
for i in range(days_to_show): for i in range(days_to_show):
forecast = self.daily_forecast[i] forecast = self.daily_forecast[i]
x = i * section_width x = i * section_width + padding
center_x = x + section_width // 2 center_x = x + (section_width - 2 * padding) // 2
# Draw day name at top - using small font # Draw day name at top
day_text = forecast['date'] # Already in "Fri" format day_text = forecast['date']
day_width = draw.textlength(day_text, font=self.display_manager.small_font) day_width = draw.textlength(day_text, font=self.display_manager.small_font)
draw.text((center_x - day_width // 2, 1), draw.text((center_x - day_width // 2, 1),
day_text, day_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['extra_dim']) fill=self.COLORS['extra_dim'])
# Draw weather icon in middle - made smaller and centered # Draw weather icon in middle
icon_size = self.ICON_SIZE['medium'] icon_size = self.ICON_SIZE['medium']
icon_y = 6 # Adjusted for better spacing with temperature below icon_y = self.display_manager.matrix.height // 3 # Position icon in upper third
icon_x = center_x - icon_size // 2 icon_x = center_x - icon_size // 2
# Draw weather icon using WeatherIcons class
WeatherIcons.draw_weather_icon(draw, forecast['condition'], icon_x, icon_y, icon_size) WeatherIcons.draw_weather_icon(draw, forecast['condition'], icon_x, icon_y, icon_size)
# Draw high/low temperatures below icon # Draw high/low temperatures at bottom
temp_text = f"{forecast['temp_low']}°/{forecast['temp_high']}°" temp_text = f"{forecast['temp_low']}°/{forecast['temp_high']}°"
temp_width = draw.textlength(temp_text, font=self.display_manager.small_font) temp_width = draw.textlength(temp_text, font=self.display_manager.small_font)
draw.text((center_x - temp_width // 2, icon_y + icon_size + 1), temp_y = self.display_manager.matrix.height - 8 # Position at bottom with small margin
draw.text((center_x - temp_width // 2, temp_y),
temp_text, temp_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['text']) fill=self.COLORS['text'])