mrq/stable-diffusion-webui
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw_inner_margin now works with legends padding

Browse Source
This commit is contained in:
EllangoK 2023-01-31 02:44:07 -05:00
parent 0451085ff5
commit 58d06a9b73
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/images.py
View File

@ -216,28 +216,23 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts):
draw_texts(d, x, y, ver_texts[row], fnt, fontsize) draw_texts(d, x, y, ver_texts[row], fnt, fontsize)
return result return result, pad_left, pad_top
def draw_inner_margins(im, margin, rows, cols, margin_color=(255, 255, 255)):
cell_width = im.width // cols
cell_height = im.height // rows
padded_width = im.width + (cols - 1) * margin
padded_height = im.height + (rows - 1) * margin
padded_im = Image.new("RGB", (padded_width, padded_height), margin_color)
def draw_inner_margins(im, margin, rows, cols, pad_left, pad_top, margin_color=(255, 255, 255)):
if margin == 0: # Early exit, not strictly necessary
return im
cell_width = (im.width - pad_left) // cols
cell_height = (im.height - pad_top) // rows
padded_im = Image.new("RGB", (im.width + (cols - 1) * margin, im.height + (rows - 1) * margin), margin_color)
for r in range(rows): for r in range(rows):
for c in range(cols): for c in range(cols):
cell_location = ( cell_location = (c * cell_width + pad_left * (c != 0),
c * cell_width, r * cell_height + pad_top * (r != 0),
r * cell_height, (c + 1) * cell_width + pad_left,
(c + 1) * cell_width, (r + 1) * cell_height + pad_top)
(r + 1) * cell_height paste_location = (c * (cell_width + margin) + pad_left * (c != 0),
) r * (cell_height + margin) + pad_top * (r != 0))
paste_location = (c * (cell_width + margin), r * (cell_height + margin))
padded_im.paste(im.crop(cell_location), paste_location) padded_im.paste(im.crop(cell_location), paste_location)
return padded_im return padded_im
def draw_prompt_matrix(im, width, height, all_prompts): def draw_prompt_matrix(im, width, height, all_prompts):

7
scripts/xyz_grid.py
View File

@ -291,9 +291,10 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend
start_index = i * len(xs) * len(ys) start_index = i * len(xs) * len(ys)
end_index = start_index + len(xs) * len(ys) end_index = start_index + len(xs) * len(ys)
grid = images.image_grid(image_cache[start_index:end_index], rows=len(ys)) grid = images.image_grid(image_cache[start_index:end_index], rows=len(ys))
grid = images.draw_inner_margins(grid, margin_size, len(ys), len(xs)) pad_left, pad_top = 0, 0
if draw_legend: if draw_legend:
grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts) grid, pad_left, pad_top = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts)
grid = images.draw_inner_margins(grid, margin_size, len(ys), len(xs), pad_left, pad_top)
sub_grids[i] = grid sub_grids[i] = grid
if include_sub_grids and len(zs) > 1: if include_sub_grids and len(zs) > 1:
processed_result.images.insert(i+1, grid) processed_result.images.insert(i+1, grid)
@ -301,7 +302,7 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend
sub_grid_size = sub_grids[0].size sub_grid_size = sub_grids[0].size
z_grid = images.image_grid(sub_grids, rows=1) z_grid = images.image_grid(sub_grids, rows=1)
if draw_legend: if draw_legend:
z_grid = images.draw_grid_annotations(z_grid, sub_grid_size[0], sub_grid_size[1], title_texts, [[images.GridAnnotation()]]) z_grid, _, _ = images.draw_grid_annotations(z_grid, sub_grid_size[0], sub_grid_size[1], title_texts, [[images.GridAnnotation()]])
processed_result.images[0] = z_grid processed_result.images[0] = z_grid
return processed_result, sub_grids return processed_result, sub_grids