Update app.py

app.py

@@ -156,10 +156,10 @@ def overlay_instances(img, mask, alpha=0.5, cmap_name="tab20"):
     return overlay
 
 # ===== 分割功能 =====
-def segment_with_choice(use_box_choice, annot_value, mode="Overlay"):
-    """分割主函数"""
+def segment_with_choice(use_box_choice, annot_value):
+    """分割主函数 - 固定使用Overlay模式"""
     if annot_value is None or len(annot_value) < 1:
-        return None, "⚠️ 请上传图像"
+        return None
 
     img_path = annot_value[0]
     bboxes = annot_value[1] if len(annot_value) > 1 else []
@@ -178,7 +178,8 @@ def segment_with_choice(use_box_choice, annot_value, mode="Overlay"):
         mask = run_seg(SEG_MODEL, img_path, box=box_array, device=SEG_DEVICE)
         print("📏 mask shape:", mask.shape, "unique ids:", np.unique(mask))
     except Exception as e:
-        return None, f"❌ 推理失败: {str(e)}"
+        print(f"❌ 推理失败: {str(e)}")
+        return None
 
     # 读取原图
     try:
@@ -187,7 +188,8 @@ def segment_with_choice(use_box_choice, annot_value, mode="Overlay"):
         if img_np.max() > 1.5:
             img_np /= 255.0
     except Exception as e:
-        return None, f"❌ 图像读取失败: {str(e)}"
+        print(f"❌ 图像读取失败: {str(e)}")
+        return None
 
     inst_mask = mask.astype(np.int32)
     unique_ids = np.unique(inst_mask)
@@ -195,18 +197,12 @@ def segment_with_choice(use_box_choice, annot_value, mode="Overlay"):
     print(f"✅ 实例数量: {num_instances}")
 
     if num_instances == 0:
-        return Image.new("RGB", mask.shape[::-1], (255, 0, 0)), "⚠️ 未检测到实例"
-
-    # 可视化
-    if mode == "Overlay":
-        overlay = overlay_instances(img_np, inst_mask, alpha=0.5, cmap_name="tab20")
-        overlay_img = Image.fromarray((overlay * 255).astype(np.uint8))
-        return overlay_img, f"✅ 检测到 {num_instances} 个细胞"
-    elif mode == "Instance Mask Only":
-        color_mask = colorize_mask(inst_mask, num_colors=512)
-        return Image.fromarray(color_mask), f"✅ 检测到 {num_instances} 个细胞"
+        return Image.new("RGB", mask.shape[::-1], (255, 0, 0))
 
-    return None, "❓ 无效显示模式"
+    # 使用Overlay模式可视化
+    overlay = overlay_instances(img_np, inst_mask, alpha=0.5, cmap_name="tab20")
+    overlay_img = Image.fromarray((overlay * 255).astype(np.uint8))
+    return overlay_img
 
 # ===== 计数功能 =====
 def count_cells_handler(image_path):
@@ -354,11 +350,6 @@ with gr.Blocks(title="Microscopy Analysis Suite", theme=gr.themes.Soft()) as dem
                             value="No",
                             label="🔲 使用边界框?"
                         )
-                        mode_radio = gr.Radio(
-                            choices=["Overlay", "Instance Mask Only"],
-                            value="Overlay",
-                            label="🎨 显示模式"
-                        )
                     
                     run_seg_btn = gr.Button("▶️ 运行分割", variant="primary", size="lg")
                     
@@ -367,8 +358,7 @@ with gr.Blocks(title="Microscopy Analysis Suite", theme=gr.themes.Soft()) as dem
                         **使用说明:**
                         1. 上传图像或从Gallery选择示例
                         2. (可选) 标注边界框并选择 "Yes"
-                        3. 选择显示模式
-                        4. 点击 "运行分割"
+                        3. 点击 "运行分割"
                         """
                     )
 
@@ -378,17 +368,13 @@ with gr.Blocks(title="Microscopy Analysis Suite", theme=gr.themes.Soft()) as dem
                         label="📸 分割结果",
                         height=400
                     )
-                    seg_status = gr.Textbox(
-                        label="📊 状态信息",
-                        lines=2
-                    )
                     
                     # 满意度评分
                     score_slider = gr.Slider(
                         minimum=1,
                         maximum=5,
                         step=1,
-                        value=3,
+                        value=5,
                         label="🌟 满意度评分 (1-5)"
                     )
                     
@@ -411,8 +397,8 @@ with gr.Blocks(title="Microscopy Analysis Suite", theme=gr.themes.Soft()) as dem
             # 绑定事件: 运行分割
             run_seg_btn.click(
                 fn=segment_with_choice,
-                inputs=[use_box_radio, annotator, mode_radio],
-                outputs=[seg_output, seg_status]
+                inputs=[use_box_radio, annotator],
+                outputs=seg_output
             )
             
             # 初始化Gallery显示