Update app.py

app.py

@@ -307,6 +307,11 @@ def merge_images_in_2_folder(folder1, folder2, outdir, suffix_need_remove = None
             result = merge_2_images(img1, img2, mode, erosion_para, dilate)
             cv2.imwrite(os.path.join(outdir, filename + extensions_folder1[index]), result)
 
+def process_line(img_path = './input', outdir = './output'):
+    depth_anything(img_path, os.path.join(outdir,"depth_anything"))
+    teed_imgs(img_path, os.path.join(outdir,"teed_imgs"), [1,7,2])
+    teed_imgs(os.path.join(outdir,"depth_anything"), os.path.join(outdir,"dp_teed_imgs"), [0,7,2])
+    merge_images_in_2_folder(os.path.join(outdir,"teed_imgs"), os.path.join(outdir,"dp_teed_imgs"), os.path.join(outdir,"merged_imgs"),'_depth', 1, 'multiply', [[2,0],[2,1]],[1,0])
 
 def invert_image(image):
     # 将图片从BGR转为灰度图
@@ -342,40 +347,12 @@ def process_images(input_folder='./output/merged_imgs'):
         except Exception as e:
             print(f"Error processing file {image_file}: {e}")
 
-def process_line(img, outdir='./output'):
-    print(f"Received img type: {type(img)}")
-
-    # 检查输入是否为字符串路径
-    if isinstance(img, str):
-        # 打印尝试读取的路径
-        print(f"Trying to read image from: {img}")
-        
-        # 检查文件是否存在
-        if not os.path.isfile(img):
-            raise ValueError(f"The file {img} does not exist.")
-        
-        img = cv2.imread(img)  # 读取图像文件
-        if img is None:
-            raise ValueError("Failed to read the image. Check the file path.")
-    elif isinstance(img, np.ndarray):
-        img = img.astype(np.uint8)  # 转换为 uint8
-    else:
-        raise ValueError("Input img is not a valid NumPy array")
-
-    # 创建输入目录
-    os.makedirs("./input", exist_ok=True)
-    # 保存上传的图像
-    cv2.imwrite(os.path.join("./input", "input_image.png"), img)
-
-    # 继续处理
-    depth_anything("./input", os.path.join(outdir, "depth_anything"))
-    teed_imgs("./input", os.path.join(outdir, "teed_imgs"), [1, 7, 2])
+def process_line(img_path='./input', outdir='./output'):
+    depth_anything(img_path, os.path.join(outdir, "depth_anything"))
+    teed_imgs(img_path, os.path.join(outdir, "teed_imgs"), [1, 7, 2])
     teed_imgs(os.path.join(outdir, "depth_anything"), os.path.join(outdir, "dp_teed_imgs"), [0, 7, 2])
     merge_images_in_2_folder(os.path.join(outdir, "teed_imgs"), os.path.join(outdir, "dp_teed_imgs"), os.path.join(outdir, "merged_imgs"), '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
-    
-    # 返回处理后的最后一张图像
-    result_img_path = os.path.join(outdir, "merged_imgs", "your_final_image_name.png")  # 修改为你的输出图像路径
-    return Image.open(result_img_path)
+    process_images(os.path.join(outdir, "merged_imgs"))  # 处理merged_imgs文件夹中的图片