Upload app.py

app.py

@@ -373,7 +373,7 @@ def draw_points_on_image(image, point, point_type):
     """在图像上绘制所有点，points 为 [(x, y, point_type), ...]"""
     image_with_points = image.copy()
     x, y = point
-    color = (255, 0, 0) if point_type == "visible" else (0, 255, 0)
+    color = (255, 0, 0) if point_type == "vis" else (0, 255, 0)
     cv2.circle(image_with_points, (int(x), int(y)), radius=10, color=color, thickness=-1)
     return image_with_points
 
@@ -392,7 +392,7 @@ def add_point(x, y, point_type, visible_points, occlusion_points):
     add操作：将新点添加到 points 列表中，
     并返回更新后的图像和新的点列表。
     """
-    if point_type == "visible":
+    if point_type == "vis":
         visible_points.append([x, y])
     else:
         occlusion_points.append([x, y])
@@ -403,7 +403,7 @@ def delete_point(point_type, visible_points, occlusion_points):
     delete操作：删除 points 列表中的最后一个点，
     并返回更新后的图像和新的点列表。
     """
-    if point_type == "visible":
+    if point_type == "vis":
         visible_points.pop()
     else:
         occlusion_points.pop()
@@ -437,13 +437,13 @@ def see_occlusion_points(image, occlusion_points):
     return updated_image
 
 def update_all_points(visible_points, occlusion_points):
-    """
-    返回一个文本描述当前两个点列表，以及对应的下拉菜单选项（字符串格式）。
-    """
     text = f"Visible Points: {visible_points}\nOcclusion Points: {occlusion_points}"
-    visible_dropdown = [f"({p[0]}, {p[1]})" for p in visible_points]
-    occlusion_dropdown = [f"({p[0]}, {p[1]})" for p in occlusion_points]
-    return text, visible_dropdown, occlusion_dropdown
+    visible_dropdown_choices = [f"({p[0]}, {p[1]})" for p in visible_points]
+    occlusion_dropdown_choices = [f"({p[0]}, {p[1]})" for p in occlusion_points]
+    # 使用 gr.Dropdown.update 明确设置 value=None
+    visible_dropdown_update = gr.Dropdown.update(value=None, choices=visible_dropdown_choices)
+    occlusion_dropdown_update = gr.Dropdown.update(value=None, choices=occlusion_dropdown_choices)
+    return text, visible_dropdown_update, occlusion_dropdown_update
 
 def delete_selected_visible(image, visible_points, occlusion_points, selected_index):
     """
@@ -495,15 +495,15 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
             with gr.Row():
                 x_input = gr.Number(label="X Coordinate", value=0)
                 y_input = gr.Number(label="Y Coordinate", value=0)
-                point_type = gr.Radio(["vis", "occ"], label="Point Prompt Type")
+                point_type = gr.Radio(["vis", "occ"], label="Point Prompt Type", value="vis")
             with gr.Row():
                 see_button = gr.Button("See Point")
                 add_button = gr.Button("Add Point")
             with gr.Row():
                 # 新增按钮：Clear、分别查看 visible/occlusion
                 clear_button = gr.Button("Clear Points")
-                see_visible_button = gr.Button("See Visible Points")
-                see_occlusion_button = gr.Button("See Occluded Points")
+                see_visible_button = gr.Button("Visible Points")
+                see_occlusion_button = gr.Button("Occluded Points")
             with gr.Row():
                 # 新增文本框实时显示点列表
                 points_text = gr.Textbox(label="Points List", interactive=False)
@@ -587,4 +587,4 @@ if __name__ == "__main__":
         pipeline.preprocess_image(Image.fromarray(np.zeros((512, 512, 3), dtype=np.uint8)))
     except:
         pass
-    demo.launch()
+    demo.launch()