feat: add gaussian multiply to mask filters

ssube · Jan 15, 2023 · 40080ad · 40080ad
1 parent f00f36b
commit 40080ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/api/onnx_web/image.py b/api/onnx_web/image.py
@@ -14,7 +14,20 @@ def mask_filter_none(mask_image: Image, dims: Tuple[int, int], origin: Tuple[int
     return noise
 
 
-def mask_filter_gaussian(mask_image: Image, dims: Tuple[int, int], origin: Tuple[int, int], rounds=3) -> Image:
+def mask_filter_gaussian_multiply(mask_image: Image, dims: Tuple[int, int], origin: Tuple[int, int], rounds=3) -> Image:
+    '''
+    Gaussian blur with multiply, source image centered on white canvas.
+    '''
+    noise = mask_filter_none(mask_image, dims, origin)
+
+    for i in range(rounds):
+        blur = noise.filter(ImageFilter.GaussianBlur(5))
+        noise = ImageChops.multiply(noise, blur)
+
+    return noise
+
+
+def mask_filter_gaussian_screen(mask_image: Image, dims: Tuple[int, int], origin: Tuple[int, int], rounds=3) -> Image:
     '''
     Gaussian blur, source image centered on white canvas.
     '''

diff --git a/api/onnx_web/serve.py b/api/onnx_web/serve.py
@@ -32,7 +32,8 @@
 from .image import (
     expand_image,
     # mask filters
-    mask_filter_gaussian,
+    mask_filter_gaussian_multiply,
+    mask_filter_gaussian_screen,
     mask_filter_none,
     # noise sources
     noise_source_gaussian,
@@ -92,7 +93,8 @@
 }
 mask_filters = {
     'none': mask_filter_none,
-    'gaussian': mask_filter_gaussian,
+    'gaussian-multiply': mask_filter_gaussian_multiply,
+    'gaussian-screen': mask_filter_gaussian_screen,
 }
 
 

diff --git a/gui/src/strings.ts b/gui/src/strings.ts
@@ -36,6 +36,7 @@ export const NOISE_LABELS: Record<string, string> = {
 };
 
 export const MASK_LABELS: Record<string, string> = {
-  gaussian: 'Gaussian Blur',
-  none: 'None',
+  'none': 'None',
+  'gaussian-multiply': 'Gaussian Multiply',
+  'gaussian-screen': 'Gaussian Screen',
 };