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

Improve weather display scaling and spacing: - Add dynamic icon sizing based on matrix dimensions - Implement consistent vertical spacing - Optimize layout calculations for full display utilization - Improve text and icon positioning - Enhance forecast display spacing

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-12 20:58:13 -05:00
parent 98696f1f7f
commit ca157e3c6b
1 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/weather_manager.py
View File

@@ -44,13 +44,14 @@ class WeatherManager:
# Calculate icon sizes based on matrix dimensions # Calculate icon sizes based on matrix dimensions
self.ICON_SIZE = { self.ICON_SIZE = {
'large': min(10, self.matrix_height // 3), 'large': min(12, self.matrix_height // 3), # Increased from 10 to 12
'medium': min(10, self.matrix_height // 3), 'medium': min(10, self.matrix_height // 4), # Adjusted ratio
'small': min(6, self.matrix_height // 5) 'small': min(8, self.matrix_height // 5) # Increased from 6 to 8
} }
# Layout constants # Layout constants - scale with matrix dimensions
self.PADDING = max(1, self.matrix_width // 64) # Scale padding with width self.PADDING = max(2, self.matrix_width // 32) # Increased minimum padding
self.VERTICAL_SPACING = max(2, self.matrix_height // 16) # Added vertical spacing
self.COLORS = { self.COLORS = {
'text': (255, 255, 255), 'text': (255, 255, 255),
'highlight': (255, 200, 0), 'highlight': (255, 200, 0),
@@ -58,7 +59,7 @@ class WeatherManager:
'temp_high': (255, 100, 100), 'temp_high': (255, 100, 100),
'temp_low': (100, 100, 255), 'temp_low': (100, 100, 255),
'dim': (180, 180, 180), 'dim': (180, 180, 180),
'extra_dim': (120, 120, 120) # Even dimmer for smallest text 'extra_dim': (120, 120, 120)
} }
# Add caching for last drawn states # Add caching for last drawn states
self.last_weather_state = None self.last_weather_state = None
@@ -226,76 +227,81 @@ class WeatherManager:
image = Image.new('RGB', (self.matrix_width, self.matrix_height)) image = Image.new('RGB', (self.matrix_width, self.matrix_height))
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
# Calculate scaled positions
top_margin = self.VERTICAL_SPACING
left_margin = self.PADDING
# Draw weather condition icon and text at the top # Draw weather condition icon and text at the top
condition = weather_data['weather'][0]['main'] condition = weather_data['weather'][0]['main']
icon_x = 1 icon_x = left_margin
icon_y = 1 icon_y = top_margin
WeatherIcons.draw_weather_icon(draw, condition, icon_x, icon_y, size=self.ICON_SIZE['large']) WeatherIcons.draw_weather_icon(draw, condition, icon_x, icon_y, size=self.ICON_SIZE['large'])
# Draw condition text next to icon (using small font) # Draw condition text next to icon
condition_text = condition condition_text = condition
draw.text((icon_x + self.ICON_SIZE['large'] + 1, icon_y), text_x = icon_x + self.ICON_SIZE['large'] + self.PADDING
draw.text((text_x, icon_y),
condition_text, condition_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['text']) fill=self.COLORS['text'])
# Draw "time ago" text below condition (using small font) # Draw "time ago" text below condition
time_since_update = int((time.time() - self.last_update) / 3600) # hours time_since_update = int((time.time() - self.last_update) / 3600)
time_text = f"{time_since_update}h" # Even shorter text time_text = f"{time_since_update}h"
draw.text((icon_x + self.ICON_SIZE['large'] + 1, icon_y + 7), # Reduced from 8 draw.text((text_x, icon_y + self.VERTICAL_SPACING * 2),
time_text, time_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['dim']) # Using dimmer color fill=self.COLORS['dim'])
# Draw current temperature on the right (using small font instead of regular) # Draw current temperature on the right
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_width = draw.textlength(temp_text, font=self.display_manager.small_font)
temp_x = self.matrix_width - temp_width - 1 # Reduced right margin temp_x = self.matrix_width - temp_width - self.PADDING
draw.text((temp_x, 1), draw.text((temp_x, top_margin),
temp_text, temp_text,
font=self.display_manager.small_font, # Changed from regular to small font=self.display_manager.small_font,
fill=self.COLORS['highlight']) fill=self.COLORS['highlight'])
# Draw high/low temperatures below current temp (using small font) # Draw high/low temperatures below current 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_width = draw.textlength(high_low_text, font=self.display_manager.small_font)
draw.text((self.matrix_width - high_low_width - 1, 9), draw.text((self.matrix_width - high_low_width - self.PADDING, top_margin + self.VERTICAL_SPACING * 2),
high_low_text, high_low_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['dim']) fill=self.COLORS['dim'])
# Draw additional weather metrics in bottom half # Draw additional weather metrics in bottom half
y_start = 16 # Start metrics lower (reduced from 18) metrics_y = self.matrix_height - (self.VERTICAL_SPACING * 4)
spacing = 6 # Reduced spacing from 7 metrics_x = left_margin
# Air pressure (shortened format) # Air pressure
pressure = weather_data['main']['pressure'] * 0.02953 # Convert hPa to inHg pressure = weather_data['main']['pressure'] * 0.02953
pressure_text = f"P:{pressure:.1f}in" # Even shorter format pressure_text = f"P:{pressure:.1f}in"
draw.text((2, y_start), draw.text((metrics_x, metrics_y),
pressure_text, pressure_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['dim']) # Using dimmer color fill=self.COLORS['dim'])
# Humidity (shortened format) # Humidity
humidity = weather_data['main']['humidity'] humidity = weather_data['main']['humidity']
humidity_text = f"H:{humidity}%" # Even shorter format humidity_text = f"H:{humidity}%"
draw.text((2, y_start + spacing), draw.text((metrics_x, metrics_y + self.VERTICAL_SPACING * 2),
humidity_text, humidity_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['dim']) # Using dimmer color fill=self.COLORS['dim'])
# Wind speed and direction (shortened format) # Wind speed and direction
wind_speed = weather_data['wind']['speed'] wind_speed = weather_data['wind']['speed']
wind_deg = weather_data.get('wind', {}).get('deg', 0) wind_deg = weather_data.get('wind', {}).get('deg', 0)
wind_dir = self._get_wind_direction(wind_deg) wind_dir = self._get_wind_direction(wind_deg)
wind_text = f"W:{wind_speed:.0f}{wind_dir}" # Even shorter format, removed decimal wind_text = f"W:{wind_speed:.0f}{wind_dir}"
draw.text((2, y_start + spacing * 2), draw.text((metrics_x, metrics_y + self.VERTICAL_SPACING * 4),
wind_text, wind_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['dim']) # Using dimmer color fill=self.COLORS['dim'])
# Update the display # Update the display
self.display_manager.image = image self.display_manager.image = image
@@ -321,7 +327,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()
@@ -331,40 +337,35 @@ class WeatherManager:
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
# Calculate layout based on matrix dimensions # 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))
total_width = self.matrix_width total_width = self.matrix_width
section_width = total_width // hours_to_show section_width = total_width // hours_to_show
padding = max(1, section_width // 8) # Scale padding with section width padding = max(self.PADDING, section_width // 6)
for i in range(hours_to_show): for i in range(hours_to_show):
forecast = self.hourly_forecast[i] forecast = self.hourly_forecast[i]
# Calculate x position with proper spacing
x = i * section_width + padding x = i * section_width + padding
# Calculate center within the section, accounting for padding
center_x = x + (section_width - 2 * padding) // 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, self.VERTICAL_SPACING),
hour_text, hour_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
icon_size = self.ICON_SIZE['medium'] icon_size = self.ICON_SIZE['medium']
icon_y = max(5, self.matrix_height // 6) # Scale vertical position icon_y = self.matrix_height // 3
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
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), draw.text((center_x - temp_width // 2, icon_y + icon_size + self.VERTICAL_SPACING),
temp_text, temp_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['text']) fill=self.COLORS['text'])
@@ -387,7 +388,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()
@@ -397,38 +398,34 @@ class WeatherManager:
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
# Calculate layout based on matrix dimensions # 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))
total_width = self.matrix_width total_width = self.matrix_width
section_width = total_width // days_to_show section_width = total_width // days_to_show
padding = max(1, section_width // 8) # Scale padding with section width padding = max(self.PADDING, section_width // 6)
for i in range(days_to_show): for i in range(days_to_show):
forecast = self.daily_forecast[i] forecast = self.daily_forecast[i]
# Calculate x position with proper spacing
x = i * section_width + padding x = i * section_width + padding
# Calculate center within the section, accounting for padding
center_x = x + (section_width - 2 * padding) // 2 center_x = x + (section_width - 2 * padding) // 2
# Draw day name at top - using small font # Draw day name
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, self.VERTICAL_SPACING),
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
icon_size = self.ICON_SIZE['medium'] icon_size = self.ICON_SIZE['medium']
icon_y = max(5, self.matrix_height // 6) # Scale vertical position icon_y = self.matrix_height // 3
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
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), draw.text((center_x - temp_width // 2, icon_y + icon_size + self.VERTICAL_SPACING),
temp_text, temp_text,
font=self.display_manager.small_font, font=self.display_manager.small_font,
fill=self.COLORS['text']) fill=self.COLORS['text'])