Update app.py

app.py

@@ -22,7 +22,7 @@ from moviepy.editor import *
 
 edge = []
 gradient = None
-params = { "fnum":0, "l":16, "c":3, "k":7 }
+params = { "fnum":0, "l":16, "c":3 }
 frame_selected = 0
 frames = []
 depths = []
@@ -367,7 +367,7 @@ def apply_mask(d):
     cv2.imwrite(f"f{frame_selected}_dmap.png", masks[frame_selected])
     return masks[frame_selected], f"f{frame_selected}_dmap.png"
 
-def draw_mask(l, c, k, v, d, evt: gr.EventData):
+def draw_mask(l, c, t, v, d, evt: gr.EventData):
     global params
     global frame_selected
     global masks
@@ -385,7 +385,7 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
     delta = 0
     ddepth = cv2.CV_16S
 
-    if len(edge) == 0 or params["fnum"] != frame_selected or params["l"] != l or params["c"] != c or params["k"] != k:
+    if len(edge) == 0 or params["fnum"] != frame_selected or params["l"] != l or params["c"] != c:
       if len(edge) > 0:
           d["background"] = cv2.imread(masks[frame_selected]).astype(np.uint8)
 
@@ -393,7 +393,7 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
 
       diff = (bg-cv2.cvtColor(gradient, cv2.COLOR_RGBA2GRAY)).astype(np.uint8)
       mask = cv2.inRange(diff, -int(c/2), int(c/2))
-      #kernel = np.ones((k,k),np.float32)/(k*k)
+      #kernel = np.ones((c,c),np.float32)/(c*c)
       #mask = cv2.filter2D(mask,-1,kernel)
       grad_x = cv2.convertScaleAbs(cv2.Sobel(mask, ddepth, 1, 0, ksize=1, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT))
       grad_y = cv2.convertScaleAbs(cv2.Sobel(mask, ddepth, 0, 1, ksize=1, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT))
@@ -418,20 +418,14 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
       params["fnum"] = frame_selected
       params["l"] = l
       params["c"] = c
-      params["k"] = k
 
       #d["layers"][0] = cv2.cvtColor(bg, cv2.COLOR_GRAY2RGBA)
       edge = bg.copy()
     else:
       bg = edge.copy()
     
-    mask = cv2.floodFill(bg, None, (x, y), 1, 0, 0)[2] #, (4 | cv2.FLOODFILL_FIXED_RANGE | cv2.FLOODFILL_MASK_ONLY | 255 << 8)
+    mask = cv2.floodFill(bg, None, (x, y), 1, int(t*256/l), int(t*256/l))[2] #, (4 | cv2.FLOODFILL_FIXED_RANGE | cv2.FLOODFILL_MASK_ONLY | 255 << 8)
     # 255 << 8 tells to fill with the value 255)
-    grad_x = cv2.convertScaleAbs(cv2.Sobel(mask, ddepth, 1, 0, ksize=3, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT))
-    grad_y = cv2.convertScaleAbs(cv2.Sobel(mask, ddepth, 0, 1, ksize=3, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT))
-    
-    grad = cv2.addWeighted(grad_x, 0.5, grad_y, 0.5, 0)
-    mask[cv2.inRange(grad, 1, 255)>0] = 1
     mask = mask[1:mask.shape[0]-1, 1:mask.shape[1]-1]
     
     d["layers"][0][mask>0] = (0,0,0,255)
@@ -494,9 +488,9 @@ with gr.Blocks(css=css) as demo:
             with gr.Accordion(label="Edge", open=False):
               levels = gr.Slider(label="Color levels", value=16, maximum=32, minimum=2, step=1)
               contour = gr.Slider(label="Contour width", value=3, maximum=15, minimum=1, step=2)
-              ksize = gr.Slider(label="Average", value=7, maximum=16, minimum=0, step=1)
+              tolerance = gr.Slider(label="Flood fill tolerance", value=0, maximum=15, minimum=0, step=1)
               mouse = gr.Textbox(elem_id="mouse", value="""[]""", interactive=False)
-              mouse.input(fn=draw_mask, show_progress="minimal", inputs=[levels, contour, ksize, mouse, output_mask], outputs=[output_mask])
+              mouse.input(fn=draw_mask, show_progress="minimal", inputs=[levels, contour, tolerance, mouse, output_mask], outputs=[output_mask])
             selector = gr.HTML(value="""
             <a href='#' id='selector' onclick='this.style.fontWeight=\"bold\";
             document.getElementById(\"image_edit\").getElementsByTagName(\"canvas\")[0].oncontextmenu = function(e){e.preventDefault();}