Merge branch 'AUTOMATIC1111:master' into improved-hr-conflict-test

1 files changed, 14 insertions, 9 deletions

diff --git a/modules/images.py b/modules/images.py
index ae3cdaf4..c2ca8849 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -16,6 +16,7 @@ from PIL import Image, ImageFont, ImageDraw, PngImagePlugin
 from fonts.ttf import Roboto

 import string

 import json

+import hashlib

 

 from modules import sd_samplers, shared, script_callbacks

 from modules.shared import opts, cmd_opts

@@ -130,7 +131,7 @@ class GridAnnotation:
         self.size = None

 

 

-def draw_grid_annotations(im, width, height, hor_texts, ver_texts):

+def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):

     def wrap(drawing, text, font, line_length):

         lines = ['']

         for word in text.split():

@@ -194,32 +195,35 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts):
             line.allowed_width = allowed_width

 

     hor_text_heights = [sum([line.size[1] + line_spacing for line in lines]) - line_spacing for lines in hor_texts]

-    ver_text_heights = [sum([line.size[1] + line_spacing for line in lines]) - line_spacing * len(lines) for lines in

-                        ver_texts]

+    ver_text_heights = [sum([line.size[1] + line_spacing for line in lines]) - line_spacing * len(lines) for lines in ver_texts]

 

     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.paste(im, (pad_left, pad_top))

+    result = Image.new("RGB", (im.width + pad_left + margin * (cols-1), im.height + pad_top + margin * (rows-1)), "white")

+

+    for row in range(rows):

+        for col in range(cols):

+            cell = im.crop((width * col, height * row, width * (col+1), height * (row+1)))

+            result.paste(cell, (pad_left + (width + margin) * col, pad_top + (height + margin) * row))

 

     d = ImageDraw.Draw(result)

 

     for col in range(cols):

-        x = pad_left + width * col + width / 2

+        x = pad_left + (width + margin) * col + width / 2

         y = pad_top / 2 - hor_text_heights[col] / 2

 

         draw_texts(d, x, y, hor_texts[col], fnt, fontsize)

 

     for row in range(rows):

         x = pad_left / 2

-        y = pad_top + height * row + height / 2 - ver_text_heights[row] / 2

+        y = pad_top + (height + margin) * row + height / 2 - ver_text_heights[row] / 2

 

         draw_texts(d, x, y, ver_texts[row], fnt, fontsize)

 

     return result

 

 

-def draw_prompt_matrix(im, width, height, all_prompts):

+def draw_prompt_matrix(im, width, height, all_prompts, margin=0):

     prompts = all_prompts[1:]

     boundary = math.ceil(len(prompts) / 2)

 

@@ -229,7 +233,7 @@ def draw_prompt_matrix(im, width, height, all_prompts):
     hor_texts = [[GridAnnotation(x, is_active=pos & (1 << i) != 0) for i, x in enumerate(prompts_horiz)] for pos in range(1 << len(prompts_horiz))]

     ver_texts = [[GridAnnotation(x, is_active=pos & (1 << i) != 0) for i, x in enumerate(prompts_vert)] for pos in range(1 << len(prompts_vert))]

 

-    return draw_grid_annotations(im, width, height, hor_texts, ver_texts)

+    return draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin)

 

 

 def resize_image(resize_mode, im, width, height, upscaler_name=None):

@@ -340,6 +344,7 @@ class FilenameGenerator:
         'date': lambda self: datetime.datetime.now().strftime('%Y-%m-%d'),

         'datetime': lambda self, *args: self.datetime(*args),  # accepts formats: [datetime], [datetime<Format>], [datetime<Format><Time Zone>]

         'job_timestamp': lambda self: getattr(self.p, "job_timestamp", shared.state.job_timestamp),

+        'prompt_hash': lambda self: hashlib.sha256(self.prompt.encode()).hexdigest()[0:8],

         'prompt': lambda self: sanitize_filename_part(self.prompt),

         'prompt_no_styles': lambda self: self.prompt_no_style(),

         'prompt_spaces': lambda self: sanitize_filename_part(self.prompt, replace_spaces=False),