Update app.py

app.py

@@ -336,7 +336,7 @@ def switch_rows(v):
         print(frames[0])
         return frames
 
-def draw_mask(ksize, th, v, d, evt: gr.EventData):
+def draw_mask(v, d, evt: gr.EventData):
     print(v)
     vv = json.loads(v)
     pts = np.array(vv, np.int32)
@@ -344,36 +344,6 @@ def draw_mask(ksize, th, v, d, evt: gr.EventData):
     
     d["layers"][0] = cv2.fillPoly(d["layers"][0], [pts], (0,0,0,255))
     d["composite"] = cv2.fillPoly(d["composite"], [pts], (0,0,0,255))
-
-    img = cv2.cvtColor(d["background"], cv2.COLOR_RGB2GRAY)
-    rows, cols = img.shape
-    crow, ccol = rows//2, cols//2
-    f = np.fft.fft2(img)
-    fshift = np.fft.fftshift(f)
-    fshift[crow-int(ksize/2):crow+int(ksize/2+1), ccol-int(ksize/2):ccol+int(ksize/2+1)] = 0
-    f_ishift = np.fft.ifftshift(fshift)
-    img_back = np.fft.ifft2(f_ishift)
-    img_back = np.real(img_back).astype(np.uint8)
-    
-
-    #scale = 1
-    #delta = 0
-    #ddepth = cv2.CV_16S
-
-    #gray = cv2.cvtColor(d["background"], cv2.COLOR_BGR2GRAY)
-    #grad_x = cv2.Sobel(gray, ddepth, 1, 0, ksize=ksize, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT)
-    # Gradient-Y
-    # grad_y = cv2.Scharr(gray,ddepth,0,1)
-    #grad_y = cv2.Sobel(gray, ddepth, 0, 1, ksize=ksize, scale=scale, delta=delta, borderType=cv2.BORDER_DEFAULT)
-    #abs_grad_x = cv2.convertScaleAbs(grad_x)
-    #abs_grad_y = cv2.convertScaleAbs(grad_y)
-
-    #grad = cv2.addWeighted(abs_grad_x, 0.5, abs_grad_y, 0.5, 0)
-    #bw = cv2.cvtColor(cv2.threshold(255-img_back, th, 255, cv2.THRESH_BINARY)[1], cv2.COLOR_GRAY2RGB)
-    bw = cv2.cvtColor(255-img_back, cv2.COLOR_GRAY2RGB)
-
-    d["background"] = bw
-    d["composite"] = bw
     print(d["composite"])
     
     return gr.ImageEditor(value=d)
@@ -428,9 +398,7 @@ with gr.Blocks(css=css) as demo:
             output_switch = gr.Checkbox(label="Show depths")
             output_switch.input(fn=switch_rows, inputs=[output_switch], outputs=[output_frame])
             output_mask = gr.ImageEditor(layers=True, sources=None, type="numpy", interactive=True, transforms=(None,), eraser=gr.Eraser(), brush=gr.Brush(default_size=0, colors=['black', '#505050', '#a0a0a0', 'white']), elem_id="image_edit")
-            ksize = gr.Slider(label="Kernel", value=128, minimum=0, maximum=1024, step=1)
-            threshold = gr.Slider(label="Threshold", value=128, minimum=0, maximum=255, step=1)
-            selector = gr.HTML(value="""<div id='select_cursor' style='width:1px;height:1px;position:absolute;border:3px dotted #ffffff;'></div>
+            selector = gr.HTML(value="""<div id='select_cursor' style='width:1px;height:1px;position:absolute;border:8px dotted #ffffff;'></div>
             <a href='#' id='selector' onclick='this.style.fontWeight=\"bold\";
             document.body.appendChild(document.getElementById(\"select_cursor\"));
             document.getElementById(\"image_edit\").getElementsByTagName(\"canvas\")[0].oncontextmenu = function(e){e.preventDefault();}
@@ -474,20 +442,19 @@ with gr.Blocks(css=css) as demo:
                 document.getElementById(\"select_cursor\").style.top = e.clientY-1 + \"px\";
               }
             }
-            document.getElementById(\"image_edit\").getElementsByTagName(\"canvas\")[0].onblur = function(e) {
-              document.getElementById(\"mouse\").getElementsByTagName(\"textarea\")[0].value = \"[]\";
-
-              document.getElementById(\"select_cursor\").style.left = 0;
-              document.getElementById(\"select_cursor\").style.top = 0;
-            }
             document.getElementById(\"image_edit\").getElementsByTagName(\"canvas\")[0].onpointerdown = function(e) {
               document.getElementById(\"select_cursor\").style.borderColor = \"#808080\";
             }
             document.getElementById(\"image_edit\").getElementsByTagName(\"canvas\")[0].onpointerup = function(e) {
               document.getElementById(\"select_cursor\").style.borderColor = \"#ffffff\";
-            }' title='select' style='text-decoration:none;color:white;'>⬚ Select polygon</a>""")
+            }' title='select' style='text-decoration:none;color:white;'>⬚ Select polygon</a> <a href='#' id='clear_select' onclick='
+              document.getElementById(\"mouse\").getElementsByTagName(\"textarea\")[0].value = \"[]\";
+
+              document.getElementById(\"select_cursor\").style.left = 0;
+              document.getElementById(\"select_cursor\").style.top = 0;
+            '>[x] Clear selection</a>""")
             mouse = gr.Textbox(elem_id="mouse", value="""[]""", interactive=False)
-            output_mask.apply(fn=draw_mask, inputs=[ksize, threshold, mouse, output_mask], outputs=[output_mask])
+            output_mask.apply(fn=draw_mask, inputs=[mouse, output_mask], outputs=[output_mask])
             submit = gr.Button("Submit")
         with gr.Column():
             model_type = gr.Dropdown([("small", "vits"), ("base", "vitb"), ("large", "vitl")], type="value", value="vits", label='Model Type')