Update app.py

app.py

@@ -337,10 +337,12 @@ def loadurl(url):
 def select_frame(v, evt: gr.SelectData):
     global frame_selected
     global masks
+    global edge
     
     if evt.index != frame_selected:
         masks[frame_selected] = v
         frame_selected = evt.index
+        edge = None
         
     return masks[frame_selected], frame_selected
 
@@ -380,10 +382,8 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
     delta = 0
     ddepth = cv2.CV_16S
 
-    if len(d["layers"]) == 1 or params["fnum"] != frame_selected or params["l"] != l or params["c"] != c or params["k"] != k:
-      if len(d["layers"]) == 1:
-          d["layers"].append(np.zeros_like(d["layers"][0]))
-      else:
+    if edge == None or params["fnum"] != frame_selected or params["l"] != l or params["c"] != c or params["k"] != k:
+      if edge != None:
           d["background"] = cv2.imread(masks[frame_selected]).astype(np.uint8)
 
       bg = cv2.cvtColor(d["background"], cv2.COLOR_RGBA2GRAY)
@@ -394,10 +394,10 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
       #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))
-      grad_z = cv2.convertScaleAbs(cv2.Sobel(mask, ddepth, 1, 1, ksize=1, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT))
+      grad = cv2.convertScaleAbs(cv2.Sobel(mask, ddepth, 1, 1, ksize=1, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT))
     
-      grad = cv2.addWeighted(grad_x, 0.5, grad_y, 0.5, 0)
-      grad = cv2.addWeighted(grad, 0.5, grad_z, 0.5, 0)
+      grad_y = cv2.addWeighted(grad_x, 0.5, grad_y, 0.5, 0)
+      grad = cv2.addWeighted(grad_y, 0.5, grad, 0.5, 0)
 
       mask = mask + cv2.inRange(grad, 1, 255)
 
@@ -417,13 +417,10 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
       params["c"] = c
       params["k"] = k
 
-      d["layers"][0] = cv2.cvtColor(bg, cv2.COLOR_GRAY2RGBA)
+      #d["layers"][0] = cv2.cvtColor(bg, cv2.COLOR_GRAY2RGBA)
       edge = bg.copy()
     else:
       bg = edge.copy()
-
-    #bg_ = cv2.copyMakeBorder(bg, 1, 1, 1, 1, cv2.BORDER_DEFAULT)
-    #bg = np.zeros_like(bg)
     
     mask = cv2.floodFill(bg, None, (x, y), 1, 0, 0)[2] #, (4 | cv2.FLOODFILL_FIXED_RANGE | cv2.FLOODFILL_MASK_ONLY | 255 << 8)
     # 255 << 8 tells to fill with the value 255)
@@ -434,7 +431,7 @@ def draw_mask(l, c, k, v, d, evt: gr.EventData):
     mask[cv2.inRange(grad, 1, 255)>0] = 1
     mask = mask[1:mask.shape[0]-1, 1:mask.shape[1]-1]
     
-    d["layers"][1][mask>0] = (0,0,0,255)
+    d["layers"][0][mask>0] = (0,0,0,255)
     d["background"][mask>0] = (0,0,0,255)
     
     return gr.ImageEditor(value=d)