From 0451085ff5422590a9f6c44230b4962808dcf857 Mon Sep 17 00:00:00 2001 From: EllangoK Date: Mon, 30 Jan 2023 22:14:57 -0500 Subject: [PATCH] adds option to draw inner margins for xyz grid --- modules/images.py | 21 +++++++++++++++++++++ scripts/xyz_grid.py | 24 ++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/modules/images.py b/modules/images.py index ae3cdaf4..c5fba30e 100644 --- a/modules/images.py +++ b/modules/images.py @@ -218,6 +218,27 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts): return result +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) + + for r in range(rows): + for c in range(cols): + cell_location = ( + c * cell_width, + r * cell_height, + (c + 1) * cell_width, + (r + 1) * cell_height + ) + paste_location = (c * (cell_width + margin), r * (cell_height + margin)) + padded_im.paste(im.crop(cell_location), paste_location) + + return padded_im def draw_prompt_matrix(im, width, height, all_prompts): prompts = all_prompts[1:] diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 3122f6f6..ff9fc356 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -205,7 +205,7 @@ axis_options = [ ] -def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend, include_lone_images, include_sub_grids, first_axes_processed, second_axes_processed): +def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend, include_lone_images, include_sub_grids, first_axes_processed, second_axes_processed, margin_size): hor_texts = [[images.GridAnnotation(x)] for x in x_labels] ver_texts = [[images.GridAnnotation(y)] for y in y_labels] title_texts = [[images.GridAnnotation(z)] for z in z_labels] @@ -291,6 +291,7 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend 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)) + grid = images.draw_inner_margins(grid, margin_size, len(ys), len(xs)) if draw_legend: grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts) sub_grids[i] = grid @@ -351,10 +352,16 @@ class Script(scripts.Script): fill_z_button = ToolButton(value=fill_values_symbol, elem_id="xyz_grid_fill_z_tool_button", visible=False) with gr.Row(variant="compact", elem_id="axis_options"): - draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend")) - include_lone_images = gr.Checkbox(label='Include Sub Images', value=False, elem_id=self.elem_id("include_lone_images")) - include_sub_grids = gr.Checkbox(label='Include Sub Grids', value=False, elem_id=self.elem_id("include_sub_grids")) - no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds")) + with gr.Column(): + draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend")) + no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds")) + with gr.Column(): + include_lone_images = gr.Checkbox(label='Include Sub Images', value=False, elem_id=self.elem_id("include_lone_images")) + include_sub_grids = gr.Checkbox(label='Include Sub Grids', value=False, elem_id=self.elem_id("include_sub_grids")) + 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")) + + with gr.Row(variant="compact", elem_id="swap_axes"): swap_xy_axes_button = gr.Button(value="Swap X/Y axes", elem_id="xy_grid_swap_axes_button") swap_yz_axes_button = gr.Button(value="Swap Y/Z axes", elem_id="yz_grid_swap_axes_button") swap_xz_axes_button = gr.Button(value="Swap X/Z axes", elem_id="xz_grid_swap_axes_button") @@ -393,9 +400,9 @@ class Script(scripts.Script): (z_values, "Z Values"), ) - return [x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds] + return [x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size] - def run(self, p, x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds): + def run(self, p, x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size): if not no_fixed_seeds: modules.processing.fix_seed(p) @@ -590,7 +597,8 @@ class Script(scripts.Script): include_lone_images=include_lone_images, include_sub_grids=include_sub_grids, first_axes_processed=first_axes_processed, - second_axes_processed=second_axes_processed + second_axes_processed=second_axes_processed, + margin_size=margin_size ) if opts.grid_save and len(sub_grids) > 1: