Skip to content

适配pillow10 #356

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

Merged
Lanly109 merged 2 commits into from
Sep 5, 2026
+14 −6
Merged

适配pillow10 #356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c975851
Merge pull request #345 from cc004/dev
Lanly109 Aug 23, 2026
77cbff0
适配pillow10
BlueYeeeee Sep 4, 2026
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
20 changes: 14 additions & 6 deletions autopcr/util/draw_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ def outp_b64(outp_img):
base64_str = f'base64://{base64.b64encode(buf.getvalue()).decode()}'
return f'[CQ:image,file={base64_str}]'

def text_size(draw, text, font):
text = str(text).replace('\t', ' ')
bbox = draw.textbbox((0, 0), text, font=font)
return bbox[2] - bbox[0], bbox[3] - bbox[1]


def position_tuple(*args):
Position = namedtuple('Position', ['top', 'right', 'bottom', 'left'])
if len(args) == 0:
Expand Down Expand Up @@ -61,8 +67,9 @@ def draw_table(table, header=[], font=ImageFont.load_default(), cell_pad=(20, 10
draw = ImageDraw.Draw(tab)
for i in range(len(table)):
for j in range(len(table[i])):
col_max_wid[j] = max(draw.textsize(table[i][j], font)[0], col_max_wid[j])
row_max_hei[i] = max(draw.textsize(table[i][j], font)[1], row_max_hei[i])
width, height = text_size(draw, table[i][j], font)
col_max_wid[j] = max(width, col_max_wid[j])
row_max_hei[i] = max(height, row_max_hei[i])
tab_width = sum(col_max_wid) + len(col_max_wid) * 2 * cell_pad[0]
tab_heigh = sum(row_max_hei) + len(row_max_hei) * 2 * cell_pad[1]

Expand Down Expand Up @@ -93,13 +100,14 @@ def draw_table(table, header=[], font=ImageFont.load_default(), cell_pad=(20, 10
bg_left, bg_top = left - cell_pad[0], top - cell_pad[1]
draw.rectangle([(bg_left, bg_top), (bg_left + col_max_wid[j] + cell_pad[0] * 2, bg_top + row_max_hei[i] + cell_pad[1] * 2)],
fill=bg_color, width=0)
text_width, text_height = text_size(draw, table[i][j], font)
_left = left
if (align and align[j] == 'c') or (header and i == 0):
_left += (col_max_wid[j] - draw.textsize(table[i][j], font)[0]) // 2
_left += (col_max_wid[j] - text_width) // 2
elif align and align[j] == 'r':
_left += col_max_wid[j] - draw.textsize(table[i][j], font)[0]
_top = top
_top += (row_max_hei[i] - draw.textsize(table[i][j], font)[1]) // 2 # always vertical center
_left += col_max_wid[j] - text_width
_top = top
_top += (row_max_hei[i] - text_height) // 2 # always vertical center
draw.text((_left, _top), table[i][j].replace('\t', ' '), font=font, fill=color)
left += col_max_wid[j] + cell_pad[0] * 2
top += row_max_hei[i] + cell_pad[1] * 2
Expand Down