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

Fix NHL logo display by using separate images and alpha compositing - Create separate images for each logo - Use alpha_composite to properly combine images - Preserve transparency during image combination

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-18 11:35:55 -05:00
parent 595b0792cd
commit 6f4a735bee
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nhl_managers.py
View File

@@ -224,19 +224,23 @@ class BaseNHLManager:
def _draw_scorebug_layout(self): def _draw_scorebug_layout(self):
"""Draw the scorebug layout for the current game.""" """Draw the scorebug layout for the current game."""
try: try:
# Create a new black image # Create a new black image for the main display
img = Image.new('RGB', (self.display_width, self.display_height), 'black') main_img = Image.new('RGB', (self.display_width, self.display_height), 'black')
draw = ImageDraw.Draw(img) draw = ImageDraw.Draw(main_img)
# Load logos once # Load logos once
home_logo = self._load_and_resize_logo(self.current_game["home_abbr"]) home_logo = self._load_and_resize_logo(self.current_game["home_abbr"])
away_logo = self._load_and_resize_logo(self.current_game["away_abbr"]) away_logo = self._load_and_resize_logo(self.current_game["away_abbr"])
# Create separate images for each logo
home_img = Image.new('RGB', (self.display_width, self.display_height), 'black')
away_img = Image.new('RGB', (self.display_width, self.display_height), 'black')
# Draw home team logo (right side) # Draw home team logo (right side)
if home_logo: if home_logo:
home_x = 3 * self.display_width // 4 - home_logo.width // 2 home_x = 3 * self.display_width // 4 - home_logo.width // 2
home_y = self.display_height // 4 - home_logo.height // 2 home_y = self.display_height // 4 - home_logo.height // 2
img.paste(home_logo, (home_x, home_y), home_logo) home_img.paste(home_logo, (home_x, home_y), home_logo)
else: else:
self.logger.warning(f"Home logo is None for team {self.current_game['home_abbr']}") self.logger.warning(f"Home logo is None for team {self.current_game['home_abbr']}")
@@ -244,10 +248,15 @@ class BaseNHLManager:
if away_logo: if away_logo:
away_x = self.display_width // 4 - away_logo.width // 2 away_x = self.display_width // 4 - away_logo.width // 2
away_y = self.display_height // 4 - away_logo.height // 2 away_y = self.display_height // 4 - away_logo.height // 2
img.paste(away_logo, (away_x, away_y), away_logo) away_img.paste(away_logo, (away_x, away_y), away_logo)
else: else:
self.logger.warning(f"Away logo is None for team {self.current_game['away_abbr']}") self.logger.warning(f"Away logo is None for team {self.current_game['away_abbr']}")
# Combine the images
main_img = Image.alpha_composite(main_img.convert('RGBA'), home_img.convert('RGBA'))
main_img = Image.alpha_composite(main_img, away_img.convert('RGBA'))
main_img = main_img.convert('RGB')
# Draw scores in the format "AWAY - HOME" # Draw scores in the format "AWAY - HOME"
home_score = str(self.current_game["home_score"]) home_score = str(self.current_game["home_score"])
away_score = str(self.current_game["away_score"]) away_score = str(self.current_game["away_score"])
@@ -261,6 +270,7 @@ class BaseNHLManager:
score_y = 3 * self.display_height // 4 - 10 score_y = 3 * self.display_height // 4 - 10
# Draw the score text # Draw the score text
draw = ImageDraw.Draw(main_img)
draw.text((score_x, score_y), score_text, font=self.fonts['score'], fill=(255, 255, 255)) draw.text((score_x, score_y), score_text, font=self.fonts['score'], fill=(255, 255, 255))
# Draw game status (period and time or "FINAL") # Draw game status (period and time or "FINAL")
@@ -272,7 +282,7 @@ class BaseNHLManager:
draw.text((status_x, status_y), status_text, font=self.fonts['status'], fill=(255, 255, 255)) draw.text((status_x, status_y), status_text, font=self.fonts['status'], fill=(255, 255, 255))
# Display the image # Display the image
self.display_manager.image.paste(img, (0, 0)) self.display_manager.image.paste(main_img, (0, 0))
self.display_manager.update_display() self.display_manager.update_display()
except Exception as e: except Exception as e: