Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bugfix + Refactor] qmk painter-convert-graphics #19994

Merged
merged 6 commits into from
May 26, 2023
Merged

[Bugfix + Refactor] qmk painter-convert-graphics #19994

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a28187
Initial code
elpekenin Mar 2, 2023
a6f04dd
Quit the loop after finding
elpekenin Mar 2, 2023
2def0e2
Always forget format...
elpekenin Mar 2, 2023
4158ec4
Update lib/python/qmk/painter.py
elpekenin Mar 12, 2023
1482a26
Update lib/python/qmk/painter.py
elpekenin Mar 12, 2023
d418470
Update painter.py
elpekenin Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions lib/python/qmk/painter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,32 +158,34 @@ def convert_requested_format(im, format):
ncolors = format["num_colors"]
image_format = format["image_format"]

## Check if ncolors is valid
# Formats accepting several options
if image_format in ['IMAGE_FORMAT_GRAYSCALE', 'IMAGE_FORMAT_PALETTE']:
valid = [2, 4, 8, 16, 256]

# Formats expecting a particular number
else:
# Read number from specs dict, instead of hardcoding
for _, fmt in valid_formats.items():
if fmt["image_format"] == image_format:
# has to be an iterable, to use `in`
valid = [fmt["num_colors"]]
break

if ncolors not in valid:
raise ValueError(f"Number of colors must be: {', '.join(valid)}.")

# Work out where we're getting the bytes from
if image_format == 'IMAGE_FORMAT_GRAYSCALE':
# Ensure we have a valid number of colors for the palette
if ncolors <= 0 or ncolors > 256 or (ncolors & (ncolors - 1) != 0):
raise ValueError("Number of colors must be 2, 4, 16, or 256.")
# If mono, convert input to grayscale, then to RGB, then grab the raw bytes corresponding to the intensity of the red channel
im = ImageOps.grayscale(im)
im = im.convert("RGB")
elif image_format == 'IMAGE_FORMAT_PALETTE':
# Ensure we have a valid number of colors for the palette
if ncolors <= 0 or ncolors > 256 or (ncolors & (ncolors - 1) != 0):
raise ValueError("Number of colors must be 2, 4, 16, or 256.")
# If color, convert input to RGB, palettize based on the supplied number of colors, then get the raw palette bytes
im = im.convert("RGB")
im = im.convert("P", palette=Image.ADAPTIVE, colors=ncolors)
elif image_format == 'IMAGE_FORMAT_RGB565':
# Ensure we have a valid number of colors for the palette
if ncolors != 65536:
raise ValueError("Number of colors must be 65536.")
# If color, convert input to RGB
im = im.convert("RGB")
elif image_format == 'IMAGE_FORMAT_RGB888':
# Ensure we have a valid number of colors for the palette
if ncolors != 1677216:
raise ValueError("Number of colors must be 16777216.")
# If color, convert input to RGB
elif image_format in ['IMAGE_FORMAT_RGB565', 'IMAGE_FORMAT_RGB888']:
# Convert input to RGB
im = im.convert("RGB")

return im
Expand Down