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

oversized MLB and NCAA Baseball logos, adjusted layout so they should be more clear. Disabled NCAA Baseball in config since my teams are out of tournament

Browse Source
This commit is contained in:
Chuck
2025-06-18 08:56:23 -05:00
parent abc66309f4
commit 4ae98a5b52
4 changed files with 201 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.json
View File

@@ -186,7 +186,7 @@
} }
}, },
"ncaa_baseball_scoreboard": { "ncaa_baseball_scoreboard": {
"enabled": true, "enabled": false,
"test_mode": false, "test_mode": false,
"update_interval_seconds": 3600, "update_interval_seconds": 3600,
"live_update_interval": 30, "live_update_interval": 30,

51
src/milb_manager.py
View File

@@ -572,26 +572,45 @@ class MiLBLiveManager(BaseMiLBManager):
width = self.display_manager.matrix.width width = self.display_manager.matrix.width
height = self.display_manager.matrix.height height = self.display_manager.matrix.height
image = Image.new('RGB', (width, height), color=(0, 0, 0)) image = Image.new('RGB', (width, height), color=(0, 0, 0))
draw = ImageDraw.Draw(image)
# Make logos 150% of display dimensions to allow them to extend off screen
max_width = int(width * 1.5)
max_height = int(height * 1.5)
# Set logo size # Load and place team logos
new_logo_height = 32
logo_size = (new_logo_height, new_logo_height) # Increase size
logo_y_offset = 0# Center vertically
# Load and place team logos (same as base method)
away_logo = self._get_team_logo(game_data['away_team']) away_logo = self._get_team_logo(game_data['away_team'])
home_logo = self._get_team_logo(game_data['home_team']) home_logo = self._get_team_logo(game_data['home_team'])
if away_logo and home_logo: if away_logo and home_logo:
away_logo = away_logo.resize(logo_size, Image.Resampling.LANCZOS) # Resize maintaining aspect ratio
home_logo = home_logo.resize(logo_size, Image.Resampling.LANCZOS) away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_x = 2 home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_y = logo_y_offset # Apply offset
home_x = width - home_logo.width - 2# home_logo.width should be 24 now # Create a single overlay for both logos
home_y = logo_y_offset # Apply offset overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
image.paste(away_logo, (away_x, away_y), away_logo)
image.paste(home_logo, (home_x, home_y), home_logo) # Calculate vertical center line for alignment
center_y = height // 2
# Draw home team logo (far right, extending beyond screen)
home_x = width - home_logo.width + 2
home_y = center_y - (home_logo.height // 2)
# Paste the home logo onto the overlay
overlay.paste(home_logo, (home_x, home_y), home_logo)
# Draw away team logo (far left, extending beyond screen)
away_x = -2
away_y = center_y - (away_logo.height // 2)
overlay.paste(away_logo, (away_x, away_y), away_logo)
# Composite the overlay with the main image
image = image.convert('RGBA')
image = Image.alpha_composite(image, overlay)
image = image.convert('RGB')
draw = ImageDraw.Draw(image)
# --- Live Game Specific Elements --- # --- Live Game Specific Elements ---
@@ -604,7 +623,7 @@ class MiLBLiveManager(BaseMiLBManager):
inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font) inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font)
inning_width = inning_bbox[2] - inning_bbox[0] inning_width = inning_bbox[2] - inning_bbox[0]
inning_x = (width - inning_width) // 2 inning_x = (width - inning_width) // 2
inning_y = 0 # Position near top center inning_y = 1 # Position near top center
# draw.text((inning_x, inning_y), inning_text, fill=(255, 255, 255), font=self.display_manager.font) # draw.text((inning_x, inning_y), inning_text, fill=(255, 255, 255), font=self.display_manager.font)
self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font) self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font)

106
src/mlb_manager.py
View File

@@ -55,7 +55,10 @@ class BaseMLBManager:
try: try:
logo_path = os.path.join(self.logo_dir, f"{team_abbr}.png") logo_path = os.path.join(self.logo_dir, f"{team_abbr}.png")
if os.path.exists(logo_path): if os.path.exists(logo_path):
return Image.open(logo_path) logo = Image.open(logo_path)
if logo.mode != 'RGBA':
logo = logo.convert('RGBA')
return logo
else: else:
logger.warning(f"Logo not found for team {team_abbr}") logger.warning(f"Logo not found for team {team_abbr}")
return None return None
@@ -123,31 +126,45 @@ class BaseMLBManager:
width = self.display_manager.matrix.width width = self.display_manager.matrix.width
height = self.display_manager.matrix.height height = self.display_manager.matrix.height
image = Image.new('RGB', (width, height), color=(0, 0, 0)) image = Image.new('RGB', (width, height), color=(0, 0, 0))
draw = ImageDraw.Draw(image)
# Set logo size to match NHL (150% of display width)
max_width = 35
max_height = 35
logo_size = (max_width, max_height)
logo_y_offset = (height - max_height) // 2
# Make logos 150% of display dimensions to allow them to extend off screen
max_width = int(width * 1.5)
max_height = int(height * 1.5)
# Load team logos # Load team logos
away_logo = self._get_team_logo(game_data['away_team']) away_logo = self._get_team_logo(game_data['away_team'])
home_logo = self._get_team_logo(game_data['home_team']) home_logo = self._get_team_logo(game_data['home_team'])
if away_logo and home_logo: if away_logo and home_logo:
away_logo = away_logo.resize(logo_size, Image.Resampling.LANCZOS) # Resize maintaining aspect ratio
home_logo = home_logo.resize(logo_size, Image.Resampling.LANCZOS) away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
# Create a single overlay for both logos
overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
# Calculate vertical center line for alignment
center_y = height // 2
# Draw home team logo (far right, extending beyond screen)
home_x = width - home_logo.width + 2
home_y = center_y - (home_logo.height // 2)
# Position logos with NHL-style spacing (0px offset) # Paste the home logo onto the overlay
away_x = 0 overlay.paste(home_logo, (home_x, home_y), home_logo)
away_y = logo_y_offset
# Draw away team logo (far left, extending beyond screen)
away_x = -2
away_y = center_y - (away_logo.height // 2)
overlay.paste(away_logo, (away_x, away_y), away_logo)
home_x = width - home_logo.width # Composite the overlay with the main image
home_y = logo_y_offset image = image.convert('RGBA')
image = Image.alpha_composite(image, overlay)
image.paste(away_logo, (away_x, away_y), away_logo) image = image.convert('RGB')
image.paste(home_logo, (home_x, home_y), home_logo)
draw = ImageDraw.Draw(image)
# For upcoming games, show date and time stacked in the center # For upcoming games, show date and time stacked in the center
if game_data['status'] == 'status_scheduled': if game_data['status'] == 'status_scheduled':
@@ -606,26 +623,45 @@ class MLBLiveManager(BaseMLBManager):
width = self.display_manager.matrix.width width = self.display_manager.matrix.width
height = self.display_manager.matrix.height height = self.display_manager.matrix.height
image = Image.new('RGB', (width, height), color=(0, 0, 0)) image = Image.new('RGB', (width, height), color=(0, 0, 0))
draw = ImageDraw.Draw(image)
# Make logos 150% of display dimensions to allow them to extend off screen
max_width = int(width * 1.5)
max_height = int(height * 1.5)
# Set logo size # Load and place team logos
new_logo_height = 32
logo_size = (new_logo_height, new_logo_height) # Increase size
logo_y_offset = 0# Center vertically
# Load and place team logos (same as base method)
away_logo = self._get_team_logo(game_data['away_team']) away_logo = self._get_team_logo(game_data['away_team'])
home_logo = self._get_team_logo(game_data['home_team']) home_logo = self._get_team_logo(game_data['home_team'])
if away_logo and home_logo: if away_logo and home_logo:
away_logo = away_logo.resize(logo_size, Image.Resampling.LANCZOS) # Resize maintaining aspect ratio
home_logo = home_logo.resize(logo_size, Image.Resampling.LANCZOS) away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_x = 2 home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_y = logo_y_offset # Apply offset
home_x = width - home_logo.width - 2# home_logo.width should be 24 now # Create a single overlay for both logos
home_y = logo_y_offset # Apply offset overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
image.paste(away_logo, (away_x, away_y), away_logo)
image.paste(home_logo, (home_x, home_y), home_logo) # Calculate vertical center line for alignment
center_y = height // 2
# Draw home team logo (far right, extending beyond screen)
home_x = width - home_logo.width + 2
home_y = center_y - (home_logo.height // 2)
# Paste the home logo onto the overlay
overlay.paste(home_logo, (home_x, home_y), home_logo)
# Draw away team logo (far left, extending beyond screen)
away_x = -2
away_y = center_y - (away_logo.height // 2)
overlay.paste(away_logo, (away_x, away_y), away_logo)
# Composite the overlay with the main image
image = image.convert('RGBA')
image = Image.alpha_composite(image, overlay)
image = image.convert('RGB')
draw = ImageDraw.Draw(image)
# --- Live Game Specific Elements --- # --- Live Game Specific Elements ---
@@ -638,7 +674,7 @@ class MLBLiveManager(BaseMLBManager):
inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font) inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font)
inning_width = inning_bbox[2] - inning_bbox[0] inning_width = inning_bbox[2] - inning_bbox[0]
inning_x = (width - inning_width) // 2 inning_x = (width - inning_width) // 2
inning_y = 0 # Position near top center inning_y = 1 # Position near top center
# draw.text((inning_x, inning_y), inning_text, fill=(255, 255, 255), font=self.display_manager.font) # draw.text((inning_x, inning_y), inning_text, fill=(255, 255, 255), font=self.display_manager.font)
self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font) self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font)
@@ -788,7 +824,7 @@ class MLBLiveManager(BaseMLBManager):
font_height = score_font.getbbox("A")[3] - score_font.getbbox("A")[1] font_height = score_font.getbbox("A")[3] - score_font.getbbox("A")[1]
except AttributeError: except AttributeError:
font_height = 8 # Fallback for default font font_height = 8 # Fallback for default font
score_y = height - font_height - 1 # 1 pixel padding from bottom score_y = height - font_height - 2 # 2 pixels padding from bottom
# Away Team:Score (Bottom Left) # Away Team:Score (Bottom Left)
away_score_x = 2 # 2 pixels padding from left away_score_x = 2 # 2 pixels padding from left

135
src/ncaa_baseball_managers.py
View File

@@ -53,7 +53,7 @@ class BaseNCAABaseballManager:
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
} }
def _get_team_logo(self, team_abbr: str, logo_size: tuple[int, int]) -> Optional[Image.Image]: def _get_team_logo(self, team_abbr: str) -> Optional[Image.Image]:
"""Get team logo from the configured directory or generate a fallback.""" """Get team logo from the configured directory or generate a fallback."""
try: try:
logo_path = os.path.join(self.logo_dir, f"{team_abbr}.png") logo_path = os.path.join(self.logo_dir, f"{team_abbr}.png")
@@ -65,6 +65,7 @@ class BaseNCAABaseballManager:
else: else:
logger.warning(f"[NCAABaseball] Logo not found for team {team_abbr}. Generating fallback.") logger.warning(f"[NCAABaseball] Logo not found for team {team_abbr}. Generating fallback.")
# Create a fallback image with the team abbreviation, ensure it's RGBA # Create a fallback image with the team abbreviation, ensure it's RGBA
logo_size = (32,32) # default size for fallback
image = Image.new('RGBA', logo_size, color=(0, 0, 0, 255)) # RGBA with full opacity image = Image.new('RGBA', logo_size, color=(0, 0, 0, 255)) # RGBA with full opacity
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
@@ -160,26 +161,45 @@ class BaseNCAABaseballManager:
width = self.display_manager.matrix.width width = self.display_manager.matrix.width
height = self.display_manager.matrix.height height = self.display_manager.matrix.height
image = Image.new('RGB', (width, height), color=(0, 0, 0)) image = Image.new('RGB', (width, height), color=(0, 0, 0))
draw = ImageDraw.Draw(image)
# Make logos 150% of display dimensions to allow them to extend off screen
max_width = int(width * 1.5)
max_height = int(height * 1.5)
max_width = 35 away_logo = self._get_team_logo(game_data['away_team'])
max_height = 35 home_logo = self._get_team_logo(game_data['home_team'])
logo_size = (max_width, max_height)
logo_y_offset = (height - max_height) // 2
away_logo = self._get_team_logo(game_data['away_team'], logo_size)
home_logo = self._get_team_logo(game_data['home_team'], logo_size)
if away_logo and home_logo: if away_logo and home_logo:
away_logo = away_logo.resize(logo_size, Image.Resampling.LANCZOS) # Resize maintaining aspect ratio
home_logo = home_logo.resize(logo_size, Image.Resampling.LANCZOS) away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_x = 0 home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_y = logo_y_offset
home_x = width - home_logo.width # Create a single overlay for both logos
home_y = logo_y_offset overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
image.paste(away_logo, (away_x, away_y), away_logo)
image.paste(home_logo, (home_x, home_y), home_logo) # Calculate vertical center line for alignment
center_y = height // 2
# Draw home team logo (far right, extending beyond screen)
home_x = width - home_logo.width + 2
home_y = center_y - (home_logo.height // 2)
# Paste the home logo onto the overlay
overlay.paste(home_logo, (home_x, home_y), home_logo)
# Draw away team logo (far left, extending beyond screen)
away_x = -2
away_y = center_y - (away_logo.height // 2)
overlay.paste(away_logo, (away_x, away_y), away_logo)
# Composite the overlay with the main image
image = image.convert('RGBA')
image = Image.alpha_composite(image, overlay)
image = image.convert('RGB')
draw = ImageDraw.Draw(image)
# For upcoming games, show date and time stacked in the center # For upcoming games, show date and time stacked in the center
if game_data['status'] == 'status_scheduled': if game_data['status'] == 'status_scheduled':
status_text = "Next Game" status_text = "Next Game"
@@ -536,25 +556,48 @@ class NCAABaseballLiveManager(BaseNCAABaseballManager):
width = self.display_manager.matrix.width width = self.display_manager.matrix.width
height = self.display_manager.matrix.height height = self.display_manager.matrix.height
image = Image.new('RGB', (width, height), color=(0, 0, 0)) image = Image.new('RGB', (width, height), color=(0, 0, 0))
draw = ImageDraw.Draw(image)
# Make logos 150% of display dimensions to allow them to extend off screen
max_width = int(width * 1.5)
max_height = int(height * 1.5)
new_logo_height = 32 away_logo = self._get_team_logo(game_data['away_team'])
logo_size = (new_logo_height, new_logo_height) home_logo = self._get_team_logo(game_data['home_team'])
logo_y_offset = 0
away_logo = self._get_team_logo(game_data['away_team'], logo_size)
home_logo = self._get_team_logo(game_data['home_team'], logo_size)
if away_logo and home_logo: if away_logo and home_logo:
away_logo = away_logo.resize(logo_size, Image.Resampling.LANCZOS) # Resize maintaining aspect ratio
home_logo = home_logo.resize(logo_size, Image.Resampling.LANCZOS) away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_x = 2 home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
away_y = logo_y_offset
home_x = width - home_logo.width - 2
home_y = logo_y_offset
image.paste(away_logo, (away_x, away_y), away_logo)
image.paste(home_logo, (home_x, home_y), home_logo)
# Create a single overlay for both logos
overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
# Calculate vertical center line for alignment
center_y = height // 2
# Draw home team logo (far right, extending beyond screen)
home_x = width - home_logo.width + 2
home_y = center_y - (home_logo.height // 2)
# Paste the home logo onto the overlay
overlay.paste(home_logo, (home_x, home_y), home_logo)
# Draw away team logo (far left, extending beyond screen)
away_x = -2
away_y = center_y - (away_logo.height // 2)
overlay.paste(away_logo, (away_x, away_y), away_logo)
# Composite the overlay with the main image
image = image.convert('RGBA')
image = Image.alpha_composite(image, overlay)
image = image.convert('RGB')
draw = ImageDraw.Draw(image)
# --- Live Game Specific Elements ---
# Define default text color
text_color = (255, 255, 255) text_color = (255, 255, 255)
inning_half_indicator = "▲" if game_data['inning_half'] == 'top' else "▼" inning_half_indicator = "▲" if game_data['inning_half'] == 'top' else "▼"
@@ -562,9 +605,10 @@ class NCAABaseballLiveManager(BaseNCAABaseballManager):
inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font) inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font)
inning_width = inning_bbox[2] - inning_bbox[0] inning_width = inning_bbox[2] - inning_bbox[0]
inning_x = (width - inning_width) // 2 inning_x = (width - inning_width) // 2
inning_y = 0 inning_y = 1 # Position near top center
self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font) self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font)
# --- REVISED BASES AND OUTS DRAWING ---
bases_occupied = game_data['bases_occupied'] bases_occupied = game_data['bases_occupied']
outs = game_data.get('outs', 0) outs = game_data.get('outs', 0)
inning_half = game_data['inning_half'] inning_half = game_data['inning_half']
@@ -640,18 +684,27 @@ class NCAABaseballLiveManager(BaseNCAABaseballManager):
def draw_bottom_outlined_text(x, y, text): def draw_bottom_outlined_text(x, y, text):
self._draw_text_with_outline(draw, text, (x,y), score_font, fill=score_text_color, outline_color=outline_color) self._draw_text_with_outline(draw, text, (x,y), score_font, fill=score_text_color, outline_color=outline_color)
away_abbr = game_data['away_team']; home_abbr = game_data['home_team'] away_abbr = game_data['away_team']; home_abbr = game_data['home_team']
away_score_str = str(game_data['away_score']); home_score_str = str(game_data['home_score']) away_score_str = str(game_data['away_score'])
away_text = f"{away_abbr}:{away_score_str}"; home_text = f"{home_abbr}:{home_score_str}" home_score_str = str(game_data['home_score'])
away_text = f"{away_abbr}:{away_score_str}"
home_text = f"{home_abbr}:{home_score_str}"
# Calculate Y position (bottom edge)
try: try:
font_height = score_font.getbbox("A")[3] - score_font.getbbox("A")[1] font_height = score_font.getbbox("A")[3] - score_font.getbbox("A")[1]
except AttributeError: except AttributeError:
font_height = 8 font_height = 8 # Fallback for default font
score_y = height - font_height - 1 score_y = height - font_height - 2 # 2 pixels padding from bottom
away_score_x = 2
# Away Team:Score (Bottom Left)
away_score_x = 2 # Padding from left
draw_bottom_outlined_text(away_score_x, score_y, away_text) draw_bottom_outlined_text(away_score_x, score_y, away_text)
# Home Team:Score (Bottom Right)
home_text_bbox = draw.textbbox((0,0), home_text, font=score_font) home_text_bbox = draw.textbbox((0,0), home_text, font=score_font)
home_text_width = home_text_bbox[2] - home_text_bbox[0] home_text_width = home_text_bbox[2] - home_text_bbox[0]
home_score_x = width - home_text_width - 2 home_score_x = width - home_text_width - 2 # Padding from right
draw_bottom_outlined_text(home_score_x, score_y, home_text) draw_bottom_outlined_text(home_score_x, score_y, home_text)
return image return image