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

fix(nhl): Use manual putpixel loop for logo drawing compatibility

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-17 14:08:02 -05:00
parent a1fc231124
commit 5c32aa019a
1 changed files with 72 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
src/nhl_scoreboard.py
View File

@@ -327,25 +327,19 @@ def create_scorebug_image(game_details):
away_logo_rgba = Image.open(game_details["away_logo_path"]).convert("RGBA") away_logo_rgba = Image.open(game_details["away_logo_path"]).convert("RGBA")
away_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS) away_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS)
# Calculate 4-element box for the target region paste_x = away_logo_pos[0]
left = away_logo_pos[0] paste_y = (DISPLAY_HEIGHT - away_logo_rgba.height) // 2
upper = (DISPLAY_HEIGHT - away_logo_rgba.height) // 2
right = left + away_logo_rgba.width
lower = upper + away_logo_rgba.height
box = (left, upper, right, lower)
# Create RGBA background region # Manual pixel paste (robust alternative)
bg_region_rgba = img.crop(box).convert("RGBA") for x in range(away_logo_rgba.width):
for y in range(away_logo_rgba.height):
# Ensure images are loaded before compositing (for compatibility) r, g, b, a = away_logo_rgba.getpixel((x, y))
bg_region_rgba.load() if a > 128: # Check alpha threshold
away_logo_rgba.load() target_x = paste_x + x
target_y = paste_y + y
# Alpha composite logo onto background region # Ensure target pixel is within image bounds
composite_region = Image.alpha_composite(bg_region_rgba, away_logo_rgba) if 0 <= target_x < img.width and 0 <= target_y < img.height:
img.putpixel((target_x, target_y), (r, g, b))
# Paste the composited region back (no mask needed)
img.paste(composite_region, (box[0], box[1]))
except Exception as e: except Exception as e:
logging.error(f"Error loading/pasting away logo {game_details['away_logo_path']}: {e}") logging.error(f"Error loading/pasting away logo {game_details['away_logo_path']}: {e}")
@@ -363,25 +357,19 @@ def create_scorebug_image(game_details):
home_logo_rgba = Image.open(game_details["home_logo_path"]).convert("RGBA") home_logo_rgba = Image.open(game_details["home_logo_path"]).convert("RGBA")
home_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS) home_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS)
# Calculate 4-element box for the target region paste_x = home_logo_pos[0]
left = home_logo_pos[0] paste_y = (DISPLAY_HEIGHT - home_logo_rgba.height) // 2
upper = (DISPLAY_HEIGHT - home_logo_rgba.height) // 2
right = left + home_logo_rgba.width
lower = upper + home_logo_rgba.height
box = (left, upper, right, lower)
# Create RGBA background region # Manual pixel paste (robust alternative)
bg_region_rgba = img.crop(box).convert("RGBA") for x in range(home_logo_rgba.width):
for y in range(home_logo_rgba.height):
# Ensure images are loaded before compositing (for compatibility) r, g, b, a = home_logo_rgba.getpixel((x, y))
bg_region_rgba.load() if a > 128: # Check alpha threshold
home_logo_rgba.load() target_x = paste_x + x
target_y = paste_y + y
# Alpha composite logo onto background region # Ensure target pixel is within image bounds
composite_region = Image.alpha_composite(bg_region_rgba, home_logo_rgba) if 0 <= target_x < img.width and 0 <= target_y < img.height:
img.putpixel((target_x, target_y), (r, g, b))
# Paste the composited region back (no mask needed)
img.paste(composite_region, (box[0], box[1]))
except Exception as e: except Exception as e:
logging.error(f"Error loading/pasting home logo {game_details['home_logo_path']}: {e}") logging.error(f"Error loading/pasting home logo {game_details['home_logo_path']}: {e}")
@@ -1096,25 +1084,19 @@ class NHLScoreboardManager:
away_logo_rgba = Image.open(game_details["away_logo_path"]).convert("RGBA") away_logo_rgba = Image.open(game_details["away_logo_path"]).convert("RGBA")
away_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS) away_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS)
# Calculate 4-element box for the target region paste_x = away_logo_x
left = away_logo_x paste_y = (self.display_height - away_logo_rgba.height) // 2
upper = (self.display_height - away_logo_rgba.height) // 2
right = left + away_logo_rgba.width
lower = upper + away_logo_rgba.height
box = (left, upper, right, lower)
# Create RGBA background region # Manual pixel paste (robust alternative)
bg_region_rgba = img.crop(box).convert("RGBA") for x in range(away_logo_rgba.width):
for y in range(away_logo_rgba.height):
# Ensure images are loaded before compositing (for compatibility) r, g, b, a = away_logo_rgba.getpixel((x, y))
bg_region_rgba.load() if a > 128: # Check alpha threshold
away_logo_rgba.load() target_x = paste_x + x
target_y = paste_y + y
# Alpha composite logo onto background region # Ensure target pixel is within image bounds
composite_region = Image.alpha_composite(bg_region_rgba, away_logo_rgba) if 0 <= target_x < img.width and 0 <= target_y < img.height:
img.putpixel((target_x, target_y), (r, g, b))
# Paste the composited region back (no mask needed)
img.paste(composite_region, (box[0], box[1]))
except Exception as e: except Exception as e:
logging.error(f"[NHL] Error rendering upcoming away logo {game_details['away_logo_path']}: {e}") logging.error(f"[NHL] Error rendering upcoming away logo {game_details['away_logo_path']}: {e}")
@@ -1128,25 +1110,19 @@ class NHLScoreboardManager:
home_logo_rgba = Image.open(game_details["home_logo_path"]).convert("RGBA") home_logo_rgba = Image.open(game_details["home_logo_path"]).convert("RGBA")
home_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS) home_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS)
# Calculate 4-element box for the target region paste_x = home_logo_x
left = home_logo_x paste_y = (self.display_height - home_logo_rgba.height) // 2
upper = (self.display_height - home_logo_rgba.height) // 2
right = left + home_logo_rgba.width
lower = upper + home_logo_rgba.height
box = (left, upper, right, lower)
# Create RGBA background region # Manual pixel paste (robust alternative)
bg_region_rgba = img.crop(box).convert("RGBA") for x in range(home_logo_rgba.width):
for y in range(home_logo_rgba.height):
# Ensure images are loaded before compositing (for compatibility) r, g, b, a = home_logo_rgba.getpixel((x, y))
bg_region_rgba.load() if a > 128: # Check alpha threshold
home_logo_rgba.load() target_x = paste_x + x
target_y = paste_y + y
# Alpha composite logo onto background region # Ensure target pixel is within image bounds
composite_region = Image.alpha_composite(bg_region_rgba, home_logo_rgba) if 0 <= target_x < img.width and 0 <= target_y < img.height:
img.putpixel((target_x, target_y), (r, g, b))
# Paste the composited region back (no mask needed)
img.paste(composite_region, (box[0], box[1]))
except Exception as e: except Exception as e:
logging.error(f"[NHL] Error rendering upcoming home logo {game_details['home_logo_path']}: {e}") logging.error(f"[NHL] Error rendering upcoming home logo {game_details['home_logo_path']}: {e}")
@@ -1221,25 +1197,19 @@ class NHLScoreboardManager:
away_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS) away_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS)
away_logo_drawn_size = away_logo_rgba.size # Keep track of size away_logo_drawn_size = away_logo_rgba.size # Keep track of size
# Calculate 4-element box for the target region paste_x = away_logo_x
left = away_logo_x paste_y = (self.display_height - away_logo_rgba.height) // 2
upper = (self.display_height - away_logo_rgba.height) // 2
right = left + away_logo_rgba.width
lower = upper + away_logo_rgba.height
box = (left, upper, right, lower)
# Create RGBA background region # Manual pixel paste (robust alternative)
bg_region_rgba = img.crop(box).convert("RGBA") for x in range(away_logo_rgba.width):
for y in range(away_logo_rgba.height):
# Ensure images are loaded before compositing (for compatibility) r, g, b, a = away_logo_rgba.getpixel((x, y))
bg_region_rgba.load() if a > 128: # Check alpha threshold
away_logo_rgba.load() target_x = paste_x + x
target_y = paste_y + y
# Alpha composite logo onto background region # Ensure target pixel is within image bounds
composite_region = Image.alpha_composite(bg_region_rgba, away_logo_rgba) if 0 <= target_x < img.width and 0 <= target_y < img.height:
img.putpixel((target_x, target_y), (r, g, b))
# Paste the composited region back (no mask needed)
img.paste(composite_region, (box[0], box[1]))
except Exception as e: except Exception as e:
logging.error(f"[NHL] Error rendering away logo {game_details['away_logo_path']}: {e}") logging.error(f"[NHL] Error rendering away logo {game_details['away_logo_path']}: {e}")
@@ -1258,25 +1228,19 @@ class NHLScoreboardManager:
home_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS) home_logo_rgba.thumbnail(logo_size, Image.Resampling.LANCZOS)
home_logo_drawn_size = home_logo_rgba.size # Keep track of size home_logo_drawn_size = home_logo_rgba.size # Keep track of size
# Calculate 4-element box for the target region paste_x = home_logo_x
left = home_logo_x paste_y = (self.display_height - home_logo_rgba.height) // 2
upper = (self.display_height - home_logo_rgba.height) // 2
right = left + home_logo_rgba.width
lower = upper + home_logo_rgba.height
box = (left, upper, right, lower)
# Create RGBA background region # Manual pixel paste (robust alternative)
bg_region_rgba = img.crop(box).convert("RGBA") for x in range(home_logo_rgba.width):
for y in range(home_logo_rgba.height):
# Ensure images are loaded before compositing (for compatibility) r, g, b, a = home_logo_rgba.getpixel((x, y))
bg_region_rgba.load() if a > 128: # Check alpha threshold
home_logo_rgba.load() target_x = paste_x + x
target_y = paste_y + y
# Alpha composite logo onto background region # Ensure target pixel is within image bounds
composite_region = Image.alpha_composite(bg_region_rgba, home_logo_rgba) if 0 <= target_x < img.width and 0 <= target_y < img.height:
img.putpixel((target_x, target_y), (r, g, b))
# Paste the composited region back (no mask needed)
img.paste(composite_region, (box[0], box[1]))
except Exception as e: except Exception as e:
logging.error(f"[NHL] Error rendering home logo {game_details['home_logo_path']}: {e}") logging.error(f"[NHL] Error rendering home logo {game_details['home_logo_path']}: {e}")