From f6d5e6cd0e7d74973551cb767ac17b9358c9884f Mon Sep 17 00:00:00 2001 From: weixin_46229132 Date: Tue, 18 Feb 2025 11:16:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E9=92=88=E5=AF=B9=E4=B8=89=E7=BB=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 27 ++++++++++++++++----------- odm_preprocess.py | 1 + odm_preprocess_fast.py | 1 + 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/main.py b/main.py index a51cd62..be63873 100644 --- a/main.py +++ b/main.py @@ -2,25 +2,29 @@ import argparse from datetime import timedelta from odm_preprocess import PreprocessConfig, ImagePreprocessor + def parse_args(): parser = argparse.ArgumentParser(description='ODM预处理工具') - + # 必需参数 parser.add_argument('--image_dir', required=True, help='输入图片目录路径') parser.add_argument('--output_dir', required=True, help='输出目录路径') - + # 可选参数 - parser.add_argument('--mode', default='重建模式', choices=['快拼模式', '三维模式', '重建模式'], help='处理模式') + parser.add_argument('--mode', default='三维模式', + choices=['快拼模式', '三维模式', '重建模式'], help='处理模式') parser.add_argument('--grid_size', type=float, default=800, help='网格大小(米)') - parser.add_argument('--grid_overlap', type=float, default=0.05, help='网格重叠率') - parser.add_argument('--produce_dem', action='store_true', help='是否生成DEM') - + parser.add_argument('--grid_overlap', type=float, + default=0.05, help='网格重叠率') + # parser.add_argument('--produce_dem', action='store_true', help='是否生成DEM') + args = parser.parse_args() return args + def main(): args = parse_args() - + # 创建配置 config = PreprocessConfig( image_dir=args.image_dir, @@ -28,8 +32,8 @@ def main(): mode=args.mode, grid_size=args.grid_size, grid_overlap=args.grid_overlap, - produce_dem=args.produce_dem, - + produce_dem=True, + # 其他参数使用默认值 cluster_eps=0.01, cluster_min_samples=5, @@ -41,10 +45,11 @@ def main(): filter_dense_distance_threshold=10, filter_time_threshold=timedelta(minutes=5), ) - + # 创建处理器并执行 processor = ImagePreprocessor(config) processor.process() + if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/odm_preprocess.py b/odm_preprocess.py index a5b5871..522ccb8 100644 --- a/odm_preprocess.py +++ b/odm_preprocess.py @@ -282,6 +282,7 @@ class ImagePreprocessor: if self.config.mode == "快拼模式": self.merge_tif(successful_grid_points, self.config.produce_dem) elif self.config.mode == "三维模式": + self.merge_tif(successful_grid_points, self.config.produce_dem) # self.merge_ply(successful_grid_points) # self.merge_obj(successful_grid_points, translations) self.convert_obj(successful_grid_points) diff --git a/odm_preprocess_fast.py b/odm_preprocess_fast.py index 128754a..3939ae2 100644 --- a/odm_preprocess_fast.py +++ b/odm_preprocess_fast.py @@ -282,6 +282,7 @@ class ImagePreprocessor: if self.config.mode == "快拼模式": self.merge_tif(successful_grid_points, self.config.produce_dem) elif self.config.mode == "三维模式": + self.merge_tif(successful_grid_points, self.config.produce_dem) # self.merge_ply(successful_grid_points) # self.merge_obj(successful_grid_points, translations) self.convert_obj(successful_grid_points)