OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-12-29 19:05:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug with wrong row count in prompt matrix

Browse Source
This commit is contained in:
AUTOMATIC 2022-08-26 18:04:00 +03:00
parent 21765c17e6
commit 21bcbb945e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webui.py
View File

@ -267,7 +267,7 @@ def load_GFPGAN():
return GFPGANer(model_path=model_path, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None) return GFPGANer(model_path=model_path, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None)
def image_grid(imgs, batch_size, round_down=False, force_n_rows=None): def image_grid(imgs, batch_size, force_n_rows=None):
if force_n_rows is not None: if force_n_rows is not None:
rows = force_n_rows rows = force_n_rows
elif opts.n_rows > 0: elif opts.n_rows > 0:
@ -276,7 +276,7 @@ def image_grid(imgs, batch_size, round_down=False, force_n_rows=None):
rows = batch_size rows = batch_size
else: else:
rows = math.sqrt(len(imgs)) rows = math.sqrt(len(imgs))
rows = int(rows) if round_down else round(rows) rows = round(rows)
cols = math.ceil(len(imgs) / rows) cols = math.ceil(len(imgs) / rows)
@ -688,18 +688,19 @@ def process_images(outpath, func_init, func_sample, prompt, seed, sampler_index,
base_count += 1 base_count += 1
if (prompt_matrix or opts.grid_save) and not do_not_save_grid: if (prompt_matrix or opts.grid_save) and not do_not_save_grid:
grid = image_grid(output_images, batch_size, round_down=prompt_matrix)
if prompt_matrix: if prompt_matrix:
grid = image_grid(output_images, batch_size, force_n_rows=1 << ((len(prompt_matrix_parts)-1)//2))
try: try:
grid = draw_prompt_matrix(grid, width, height, prompt_matrix_parts) grid = draw_prompt_matrix(grid, width, height, prompt_matrix_parts)
except Exception: except:
import traceback import traceback
print("Error creating prompt_matrix text:", file=sys.stderr) print("Error creating prompt_matrix text:", file=sys.stderr)
print(traceback.format_exc(), file=sys.stderr) print(traceback.format_exc(), file=sys.stderr)
output_images.insert(0, grid) output_images.insert(0, grid)
else:
grid = image_grid(output_images, batch_size)
save_image(grid, outpath, f"grid-{grid_count:04}", seed, prompt, opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename) save_image(grid, outpath, f"grid-{grid_count:04}", seed, prompt, opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename)
grid_count += 1 grid_count += 1