From 969d896187275ec1849fad099823fbf7bb8b8d0a Mon Sep 17 00:00:00 2001 From: Extraltodeus Date: Mon, 7 Nov 2022 23:16:16 +0100 Subject: [PATCH 1/3] Update test_my_prompt_custom_script.py --- test_my_prompt_custom_script.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test_my_prompt_custom_script.py b/test_my_prompt_custom_script.py index 3ab7503..0b779dd 100644 --- a/test_my_prompt_custom_script.py +++ b/test_my_prompt_custom_script.py @@ -14,10 +14,11 @@ class Script(scripts.Script): neg_pos = gr.Dropdown(label="Test negative or positive", choices=["Positive","Negative"], value="Positive") skip_x_first = gr.Slider(minimum=0, maximum=32, step=1, label='Skip X first words', value=0) separator = gr.Textbox(label="Separator used", lines=1, value=", ") + always_grid = gr.Checkbox(label='Always generate a grid', value=True) font_size = gr.Slider(minimum=12, maximum=64, step=1, label='Font size', value=32) - return [neg_pos,skip_x_first,separator,font_size] + return [neg_pos,skip_x_first,separator,always_grid,font_size] - def run(self, p,neg_pos,skip_x_first,separator,font_size): + def run(self, p,neg_pos,skip_x_first,separator,always_grid,font_size): def write_on_image(img, msg): ix,iy = img.size draw = ImageDraw.Draw(img) @@ -74,7 +75,7 @@ class Script(scripts.Script): images.save_image(proc.images[0], p.outpath_samples, "", proc.seed, proc.prompt, opts.samples_format, info= proc.info, p=p) unwanted_grid_because_of_img_count = len(output_images) < 2 and opts.grid_only_if_multiple - if (opts.return_grid or opts.grid_save) and not p.do_not_save_grid and not unwanted_grid_because_of_img_count: + if ((opts.return_grid or opts.grid_save) and not p.do_not_save_grid and not unwanted_grid_because_of_img_count) or always_grid: grid = images.image_grid(output_images) if opts.grid_save: images.save_image(grid, p.outpath_grids, "grid", initial_seed, initial_prompt, opts.grid_format, info=proc.info, short_filename=not opts.grid_extended_filename, p=p, grid=True) From 4c0561e4a9f37e9f4c85eeacc579bcc75e08e93d Mon Sep 17 00:00:00 2001 From: Extraltodeus Date: Mon, 7 Nov 2022 23:25:39 +0100 Subject: [PATCH 2/3] Update test_my_prompt_custom_script.py --- test_my_prompt_custom_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_my_prompt_custom_script.py b/test_my_prompt_custom_script.py index 0b779dd..3dfad56 100644 --- a/test_my_prompt_custom_script.py +++ b/test_my_prompt_custom_script.py @@ -67,7 +67,7 @@ class Script(scripts.Script): proc = process_images(p) if f >= 0: - proc.images[0] = write_on_image(proc.images[0], prompt_array[f]) + proc.images[0] = write_on_image(proc.images[0], "no "+prompt_array[f]) else: proc.images[0] = write_on_image(proc.images[0], "full prompt") From e682807da0a84f50d4a42d9b9580eff3cb415f56 Mon Sep 17 00:00:00 2001 From: Extraltodeus Date: Mon, 7 Nov 2022 23:31:14 +0100 Subject: [PATCH 3/3] Update test_my_prompt_custom_script.py --- test_my_prompt_custom_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_my_prompt_custom_script.py b/test_my_prompt_custom_script.py index 3dfad56..d953645 100644 --- a/test_my_prompt_custom_script.py +++ b/test_my_prompt_custom_script.py @@ -77,6 +77,6 @@ class Script(scripts.Script): unwanted_grid_because_of_img_count = len(output_images) < 2 and opts.grid_only_if_multiple if ((opts.return_grid or opts.grid_save) and not p.do_not_save_grid and not unwanted_grid_because_of_img_count) or always_grid: grid = images.image_grid(output_images) - if opts.grid_save: + if opts.grid_save or always_grid: images.save_image(grid, p.outpath_grids, "grid", initial_seed, initial_prompt, opts.grid_format, info=proc.info, short_filename=not opts.grid_extended_filename, p=p, grid=True) return proc