From 32f73eef8a85765bd1539fa72887342bcb5a28e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E6=BE=B3?= <islong.ao@outlook.com>
Date: Thu, 2 Jan 2025 10:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 odm_preprocess.py    | 14 +++++++-------
 utils/odm_monitor.py |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/odm_preprocess.py b/odm_preprocess.py
index da61dda..6760433 100644
--- a/odm_preprocess.py
+++ b/odm_preprocess.py
@@ -261,10 +261,10 @@ class ImagePreprocessor:
             self.copy_images(grid_points)
             self.logger.info("预处理任务完成")
 
-            # self.odm_monitor.process_all_grids(grid_points)
-            # self.merge_tif(grid_points)
-            # self.merge_obj(grid_points, translations)
-            # self.merge_ply(grid_points)
+            self.odm_monitor.process_all_grids(grid_points)
+            self.merge_tif(grid_points)
+            self.merge_ply(grid_points)
+            self.merge_obj(grid_points, translations)
         except Exception as e:
             self.logger.error(f"处理过程中发生错误: {str(e)}", exc_info=True)
             raise
@@ -273,8 +273,8 @@ class ImagePreprocessor:
 if __name__ == "__main__":
     # 创建配置
     config = PreprocessConfig(
-        image_dir=r"E:\datasets\UAV\134\project\images",
-        output_dir=r"G:\ODM_output\134_test",
+        image_dir=r"E:\datasets\UAV\1815\project\images",
+        output_dir=r"G:\ODM_output\1815",
 
         cluster_eps=0.01,
         cluster_min_samples=5,
@@ -290,7 +290,7 @@ if __name__ == "__main__":
         filter_dense_distance_threshold=10,
         filter_time_threshold=timedelta(minutes=5),
 
-        grid_size=300,
+        grid_size=500,
         grid_overlap=0.1,
 
 
diff --git a/utils/odm_monitor.py b/utils/odm_monitor.py
index d03de12..12e6773 100644
--- a/utils/odm_monitor.py
+++ b/utils/odm_monitor.py
@@ -31,7 +31,7 @@ class ODMProcessMonitor:
             f"-v {grid_dir}:/datasets "
             f"opendronemap/odm:gpu "
             f"--project-path /datasets project "
-            f"--max-concurrency 10 "
+            f"--max-concurrency 15 "
             f"--force-gps "
             f"--feature-quality lowest "
             f"--orthophoto-resolution 10 "