app update

app.py

@@ -1,6 +1,6 @@
-# Gradio YOLOv8 Det v0.2
+# Gradio YOLOv8 Det v0.2.2
 # 创建人：曾逸夫
-# 创建时间：2023-01-20
+# 创建时间：2023-01-23
 
 import argparse
 import csv
@@ -45,7 +45,7 @@ from util.fonts_opt import is_fonts
 ROOT_PATH = sys.path[0]  # 根目录
 
 # Gradio YOLOv8 Det版本
-GYD_VERSION = "Gradio YOLOv8 Det v0.2"
+GYD_VERSION = "Gradio YOLOv8 Det v0.2.2"
 
 # 文件后缀
 suffix_list = [".csv", ".yaml"]
@@ -58,7 +58,7 @@ obj_style = ["小目标", "中目标", "大目标"]
 
 
 def parse_args(known=False):
-    parser = argparse.ArgumentParser(description="Gradio YOLOv8 Det v0.2")
+    parser = argparse.ArgumentParser(description="Gradio YOLOv8 Det v0.2.2")
     parser.add_argument("--model_type", "-mt", default="online", type=str, help="model type")
     parser.add_argument("--source", "-src", default="upload", type=str, help="image input source")
     parser.add_argument("--source_video", "-src_v", default="upload", type=str, help="video input source")
@@ -236,12 +236,9 @@ def polygon_drawing(img_mask, canvas, color_seg):
 # 输出分割结果
 def seg_output(img_path, seg_mask_list, color_list, cls_list):
     img = cv2.imread(img_path)
-    w, h = img.shape[1], img.shape[0]
-    img = cv2.cvtColor(img, cv2.COLOR_BGR2BGRA)
+    img_c = img.copy()
 
     w, h = img.shape[1], img.shape[0]
-    canvas = np.zeros((h, w, 3), dtype=np.uint8)
-    canvas = cv2.cvtColor(canvas, cv2.COLOR_BGR2BGRA)
 
     # 获取分割坐标
     for seg_mask, cls_index in zip(seg_mask_list, cls_list):
@@ -249,9 +246,9 @@ def seg_output(img_path, seg_mask_list, color_list, cls_list):
         for i in range(len(seg_mask)):
             img_mask.append([seg_mask[i][0] * w, seg_mask[i][1] * h])
 
-        polygon_drawing(img_mask, canvas, color_list[int(cls_index)])  # 绘制分割图形
+        polygon_drawing(img_mask, img_c, color_list[int(cls_index)])  # 绘制分割图形
 
-    img_mask_merge = cv2.add(img, canvas)  # 合并图像
+    img_mask_merge = cv2.addWeighted(img, 0.3, img_c, 0.7, 0)  # 合并图像
 
     return img_mask_merge