aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/prompt_matrix.py
diff options
context:
space:
mode:
authorspace-nuko <24979496+space-nuko@users.noreply.github.com>2023-03-11 00:42:46 +0000
committerspace-nuko <24979496+space-nuko@users.noreply.github.com>2023-03-11 00:42:46 +0000
commitac38ad7e60bb0ff3194536a72dd1259edad0b30a (patch)
tree7bd8f6611874a833298c77dc8528f569338f373e /scripts/prompt_matrix.py
parent716a69237cefb385f71105dbbf50e92d664e0f42 (diff)
parent0cc0ee1bcb4c24a8c9715f66cede06601bfc00c8 (diff)
downloadstable-diffusion-webui-gfx803-ac38ad7e60bb0ff3194536a72dd1259edad0b30a.tar.gz
stable-diffusion-webui-gfx803-ac38ad7e60bb0ff3194536a72dd1259edad0b30a.tar.bz2
stable-diffusion-webui-gfx803-ac38ad7e60bb0ff3194536a72dd1259edad0b30a.zip
Merge remote-tracking branch 'origin/master' into unipc
Diffstat (limited to 'scripts/prompt_matrix.py')
-rw-r--r--scripts/prompt_matrix.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 3ee3cbe4..b1c486d4 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -54,7 +54,7 @@ class Script(scripts.Script):
prompt_type = gr.Radio(["positive", "negative"], label="Select prompt", elem_id=self.elem_id("prompt_type"), value="positive")
variations_delimiter = gr.Radio(["comma", "space"], label="Select joining char", elem_id=self.elem_id("variations_delimiter"), value="comma")
with gr.Column():
- margin_size = gr.Slider(label="Grid margins (px)", min=0, max=500, value=0, step=2, elem_id=self.elem_id("margin_size"))
+ margin_size = gr.Slider(label="Grid margins (px)", minimum=0, maximum=500, value=0, step=2, elem_id=self.elem_id("margin_size"))
return [put_at_start, different_seeds, prompt_type, variations_delimiter, margin_size]
@@ -99,8 +99,8 @@ class Script(scripts.Script):
p.prompt_for_display = positive_prompt
processed = process_images(p)
- grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2))
- grid = images.draw_prompt_matrix(grid, p.width, p.height, prompt_matrix_parts, margin_size)
+ grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2))
+ grid = images.draw_prompt_matrix(grid, processed.images[0].width, processed.images[1].height, prompt_matrix_parts, margin_size)
processed.images.insert(0, grid)
processed.index_of_first_image = 1
processed.infotexts.insert(0, processed.infotexts[0])