aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRnDMonkey <ryandrutledge@gmail.com>2022-10-01 20:56:29 +0000
committerRnDMonkey <ryandrutledge@gmail.com>2022-10-01 20:56:29 +0000
commiteba0c29dbc3bad8c4e32f1fa3a03dc6f9caf1f5a (patch)
tree496be8a3a5e794f0100a98c7b93a949d2451b880 /scripts
parentcf141157e7b49b0b3a6e57dc7aa0d1345158b4c8 (diff)
downloadstable-diffusion-webui-gfx803-eba0c29dbc3bad8c4e32f1fa3a03dc6f9caf1f5a.tar.gz
stable-diffusion-webui-gfx803-eba0c29dbc3bad8c4e32f1fa3a03dc6f9caf1f5a.tar.bz2
stable-diffusion-webui-gfx803-eba0c29dbc3bad8c4e32f1fa3a03dc6f9caf1f5a.zip
Updated xy_grid infotext formatting, parser regex
Diffstat (limited to 'scripts')
-rw-r--r--scripts/xy_grid.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index d9f8d55b..f87c6c1f 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -245,12 +245,16 @@ class Script(scripts.Script):
return process_images(pc)
if not x_opt.label == 'Nothing':
- p.extra_generation_params["X/Y Plot X Type"] = x_opt.label
- p.extra_generation_params["X Values"] = '{' + ", ".join([f'{x}' for x in xs]) + '}'
+ p.extra_generation_params["XY Plot X Type"] = x_opt.label
+ p.extra_generation_params["X Values"] = '{' + x_values + '}'
+ if x_opt.label in ["Seed","Var. seed"] and not no_fixed_seeds:
+ p.extra_generation_params["Fixed X Values"] = '{' + ", ".join([str(x) for x in xs])+ '}'
if not y_opt.label == 'Nothing':
- p.extra_generation_params["X/Y Plot Y Type"] = y_opt.label
- p.extra_generation_params["Y Values"] = '{' + ", ".join([f'{y}' for y in ys]) + '}'
+ p.extra_generation_params["XY Plot Y Type"] = y_opt.label
+ p.extra_generation_params["Y Values"] = '{' + y_values + '}'
+ if y_opt.label in ["Seed","Var. seed"] and not no_fixed_seeds:
+ p.extra_generation_params["Fixed Y Values"] = '{' + ", ".join([str(y) for y in ys])+ '}'
processed = draw_xy_grid(
p,