xyz_grid: allow varying the seed along an axis along with the axis's other changes
This commit is contained in:
parent
68f336bd99
commit
c4ee6d9b73
|
@ -416,6 +416,10 @@ class Script(scripts.Script):
|
||||||
with gr.Column():
|
with gr.Column():
|
||||||
include_lone_images = gr.Checkbox(label='Include Sub 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"))
|
include_sub_grids = gr.Checkbox(label='Include Sub Grids', value=False, elem_id=self.elem_id("include_sub_grids"))
|
||||||
|
with gr.Column():
|
||||||
|
vary_seeds_x = gr.Checkbox(label='Vary seed on X axis', value=False, elem_id=self.elem_id("vary_seeds_x"))
|
||||||
|
vary_seeds_y = gr.Checkbox(label='Vary seed on Y axis', value=False, elem_id=self.elem_id("vary_seeds_y"))
|
||||||
|
vary_seeds_z = gr.Checkbox(label='Vary seed on Z axis', value=False, elem_id=self.elem_id("vary_seeds_z"))
|
||||||
with gr.Column():
|
with gr.Column():
|
||||||
margin_size = gr.Slider(label="Grid margins (px)", minimum=0, maximum=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"))
|
||||||
|
|
||||||
|
@ -475,9 +479,9 @@ class Script(scripts.Script):
|
||||||
(z_values_dropdown, lambda params:get_dropdown_update_from_params("Z",params)),
|
(z_values_dropdown, lambda params:get_dropdown_update_from_params("Z",params)),
|
||||||
)
|
)
|
||||||
|
|
||||||
return [x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size]
|
return [x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, vary_seeds_x, vary_seeds_y, vary_seeds_z, margin_size]
|
||||||
|
|
||||||
def run(self, p, x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size):
|
def run(self, p, x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, vary_seeds_x, vary_seeds_y, vary_seeds_z, margin_size):
|
||||||
if not no_fixed_seeds:
|
if not no_fixed_seeds:
|
||||||
modules.processing.fix_seed(p)
|
modules.processing.fix_seed(p)
|
||||||
|
|
||||||
|
@ -648,6 +652,16 @@ class Script(scripts.Script):
|
||||||
y_opt.apply(pc, y, ys)
|
y_opt.apply(pc, y, ys)
|
||||||
z_opt.apply(pc, z, zs)
|
z_opt.apply(pc, z, zs)
|
||||||
|
|
||||||
|
xdim = len(xs) if vary_seeds_x else 1
|
||||||
|
ydim = len(ys) if vary_seeds_y else 1
|
||||||
|
|
||||||
|
if vary_seeds_x:
|
||||||
|
pc.seed += ix
|
||||||
|
if vary_seeds_y:
|
||||||
|
pc.seed += iy * xdim
|
||||||
|
if vary_seeds_z:
|
||||||
|
pc.seed += iz * xdim * ydim
|
||||||
|
|
||||||
res = process_images(pc)
|
res = process_images(pc)
|
||||||
|
|
||||||
# Sets subgrid infotexts
|
# Sets subgrid infotexts
|
||||||
|
|
Loading…
Reference in New Issue