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

X/Y/Z plot now saves sub grids if opts.grid_save and honors draw_legend #7334

Merged
merged 1 commit into from
Feb 1, 2023
Merged

X/Y/Z plot now saves sub grids if opts.grid_save and honors draw_legend #7334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions scripts/xyz_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,23 +286,24 @@ def index(ix, iy, iz):
print("Unexpected error: draw_xyz_grid failed to return even a single processed image")
return Processed(p, [])

grids = [None] * len(zs)
sub_grids = [None] * len(zs)
for i in range(len(zs)):
start_index = i * 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))
if draw_legend:
grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts)

grids[i] = grid
sub_grids[i] = grid
if include_sub_grids and len(zs) > 1:
processed_result.images.insert(i+1, grid)

original_grid_size = grids[0].size
grids = images.image_grid(grids, rows=1)
processed_result.images[0] = images.draw_grid_annotations(grids, original_grid_size[0], original_grid_size[1], title_texts, [[images.GridAnnotation()]])
sub_grid_size = sub_grids[0].size
z_grid = images.image_grid(sub_grids, rows=1)
if draw_legend:
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

return processed_result
return processed_result, sub_grids


class SharedSettingsStackHelper(object):
Expand Down Expand Up @@ -576,7 +577,7 @@ def cell(x, y, z):
return res

with SharedSettingsStackHelper():
processed = draw_xyz_grid(
processed, sub_grids = draw_xyz_grid(
p,
xs=xs,
ys=ys,
Expand All @@ -592,6 +593,10 @@ def cell(x, y, z):
second_axes_processed=second_axes_processed
)

if opts.grid_save and len(sub_grids) > 1:
for sub_grid in sub_grids:
images.save_image(sub_grid, p.outpath_grids, "xyz_grid", info=grid_infotext[0], extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)

if opts.grid_save:
images.save_image(processed.images[0], p.outpath_grids, "xyz_grid", info=grid_infotext[0], extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)

Expand Down