From 175baaaca23d3e58bbeaef183b1ee3e6344badec Mon Sep 17 00:00:00 2001
From: DepFA <35278260+dfaker@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:46:18 +0100
Subject: xy_grid - Show blank cells when grid is incomplete

---
 scripts/xy_grid.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 3a2e103f..279af6b7 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -2,6 +2,7 @@ from collections import namedtuple
 from copy import copy
 import random
 
+from PIL import Image
 import numpy as np
 
 import modules.scripts as scripts
@@ -108,7 +109,10 @@ def draw_xy_grid(p, xs, ys, x_labels, y_labels, cell, draw_legend):
             if first_pocessed is None:
                 first_pocessed = processed
 
-            res.append(processed.images[0])
+            try:
+              res.append(processed.images[0])
+            except:
+              res.append(Image.new(res[0].mode, res[0].size))
 
     grid = images.image_grid(res, rows=len(ys))
     if draw_legend:
-- 
cgit v1.2.3


From fc2aa6b8f379c341bed9c7bc3457b5be9790f6ce Mon Sep 17 00:00:00 2001
From: DepFA <35278260+dfaker@users.noreply.github.com>
Date: Mon, 26 Sep 2022 15:46:01 +0100
Subject: Add extra sampler params to xy_grid

---
 scripts/xy_grid.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 279af6b7..3721c717 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -87,7 +87,12 @@ axis_options = [
     AxisOption("Prompt S/R", str, apply_prompt, format_value),
     AxisOption("Sampler", str, apply_sampler, format_value),
     AxisOption("Checkpoint name", str, apply_checkpoint, format_value),
-    AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label), #  as it is now all AxisOptionImg2Img items must go after AxisOption ones
+    AxisOption("Sigma Churn", float, apply_field("s_churn"),  format_value_add_label),
+    AxisOption("Sigma min",   float, apply_field("s_tmin"),   format_value_add_label),
+    AxisOption("Sigma max",   float, apply_field("s_tmax"),   format_value_add_label),
+    AxisOption("Sigma noise", float, apply_field("s_noise"),  format_value_add_label),
+    AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label),
+    AxisOptionImg2Img("DDIM Eta", float, apply_field("ddim_eta"), format_value_add_label) #  as it is now all AxisOptionImg2Img items must go after AxisOption ones
 ]
 
 
-- 
cgit v1.2.3


From 76d6f7b40728abf1cc6268f20b3ff446fb99123f Mon Sep 17 00:00:00 2001
From: DepFA <35278260+dfaker@users.noreply.github.com>
Date: Mon, 26 Sep 2022 17:48:25 +0100
Subject: Add DDIM Eta to txt2img in xy_grid

---
 scripts/xy_grid.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 3721c717..7c01231f 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -91,8 +91,8 @@ axis_options = [
     AxisOption("Sigma min",   float, apply_field("s_tmin"),   format_value_add_label),
     AxisOption("Sigma max",   float, apply_field("s_tmax"),   format_value_add_label),
     AxisOption("Sigma noise", float, apply_field("s_noise"),  format_value_add_label),
-    AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label),
-    AxisOptionImg2Img("DDIM Eta", float, apply_field("ddim_eta"), format_value_add_label) #  as it is now all AxisOptionImg2Img items must go after AxisOption ones
+    AxisOption("DDIM Eta",    float, apply_field("ddim_eta"), format_value_add_label),
+    AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label),#  as it is now all AxisOptionImg2Img items must go after AxisOption ones
 ]
 
 
-- 
cgit v1.2.3