handling sub grids and merging into one (e46bfa5a) · Commits · github_fork / Stable Diffusion Webui

modules/images.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -195,7 +195,7 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts):
	ver_text_heights = [sum([line.size[1] + line_spacing for line in lines]) - line_spacing * len(lines) for lines in		ver_text_heights = [sum([line.size[1] + line_spacing for line in lines]) - line_spacing * len(lines) for lines in
	ver_texts]		ver_texts]

	pad_top = max(hor_text_heights) + line_spacing * 2		pad_top = 0 if sum(hor_text_heights) == 0 else max(hor_text_heights) + line_spacing * 2

	result = Image.new("RGB", (im.width + pad_left, im.height + pad_top), "white")		result = Image.new("RGB", (im.width + pad_left, im.height + pad_top), "white")
	result.paste(im, (pad_left, pad_top))		result.paste(im, (pad_left, pad_top))

scripts/xyz_grid.py

+18 −11

Original line number	Original line	Diff line number	Diff line
	@@ -205,9 +205,9 @@ axis_options = [
	]		]


	def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend, include_lone_images, swap_axes_processing_order):		def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend, include_lone_images, include_sub_grids, swap_axes_processing_order):
	ver_texts = [[images.GridAnnotation(y)] for y in y_labels]
	hor_texts = [[images.GridAnnotation(x)] for x in x_labels]		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]		title_texts = [[images.GridAnnotation(z)] for z in z_labels]

	# Temporary list of all the images that are generated to be populated into the grid.		# Temporary list of all the images that are generated to be populated into the grid.
	@@ -266,16 +266,21 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend
	print("Unexpected error: draw_xyz_grid failed to return even a single processed image")		print("Unexpected error: draw_xyz_grid failed to return even a single processed image")
	return Processed(p, [])		return Processed(p, [])

	for i, title_text in enumerate(title_texts):		grids = [None] * len(zs)
			for i in range(len(zs)):
	start_index = i * len(xs) * len(ys)		start_index = i * len(xs) * len(ys)
	end_index = start_index + 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.image_grid(image_cache[start_index:end_index], rows=len(ys))
	if draw_legend:		if draw_legend:
	grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts)		grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts)
	if i == 0: # First position is a placeholder as mentioned above, so it can be directly replaced
	processed_result.images[0] = grid		grids[i] = grid
	else:		if include_sub_grids and len(zs) > 1:
	processed_result.images.insert(i, grid)		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()]])

	return processed_result		return processed_result

	@@ -326,7 +331,8 @@ class Script(scripts.Script):

	with gr.Row(variant="compact", elem_id="axis_options"):		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"))		draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend"))
	include_lone_images = gr.Checkbox(label='Include Separate Images', value=False, elem_id=self.elem_id("include_lone_images"))		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"))		no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds"))
	swap_xy_axes_button = gr.Button(value="Swap X/Y axes", elem_id="xy_grid_swap_axes_button")		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_yz_axes_button = gr.Button(value="Swap Y/Z axes", elem_id="yz_grid_swap_axes_button")
	@@ -357,9 +363,9 @@ class Script(scripts.Script):
	y_type.change(fn=select_axis, inputs=[y_type], outputs=[fill_y_button])		y_type.change(fn=select_axis, inputs=[y_type], outputs=[fill_y_button])
	z_type.change(fn=select_axis, inputs=[z_type], outputs=[fill_z_button])		z_type.change(fn=select_axis, inputs=[z_type], outputs=[fill_z_button])

	return [x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, 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]

	def run(self, p, x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, 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):
	if not no_fixed_seeds:		if not no_fixed_seeds:
	modules.processing.fix_seed(p)		modules.processing.fix_seed(p)

	@@ -527,10 +533,11 @@ class Script(scripts.Script):
	zs=zs,		zs=zs,
	x_labels=[x_opt.format_value(p, x_opt, x) for x in xs],		x_labels=[x_opt.format_value(p, x_opt, x) for x in xs],
	y_labels=[y_opt.format_value(p, y_opt, y) for y in ys],		y_labels=[y_opt.format_value(p, y_opt, y) for y in ys],
	z_labels=[y_opt.format_value(p, z_opt, z) for z in zs],		z_labels=[z_opt.format_value(p, z_opt, z) for z in zs],
	cell=cell,		cell=cell,
	draw_legend=draw_legend,		draw_legend=draw_legend,
	include_lone_images=include_lone_images,		include_lone_images=include_lone_images,
			include_sub_grids=include_sub_grids,
	swap_axes_processing_order=swap_axes_processing_order		swap_axes_processing_order=swap_axes_processing_order
	)		)

Admin message