diff --git a/README.md b/README.md index 2ed8f52..ddfc592 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,16 @@ # ODM_Pro 无人机三维重建 + +## Install + +```bash +conda install fiona +pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple +``` + +## TODO + +- 过滤算法需要更新 +- 快拼模式需要更新 +- 合并obj影像需要更新 +- command_runner中rerun需要更新,参数继续试 diff --git a/odm_preprocess.py b/odm_preprocess.py index d4413f1..af9643b 100644 --- a/odm_preprocess.py +++ b/odm_preprocess.py @@ -245,7 +245,7 @@ class ImagePreprocessor: f"grid_{grid_idx + 1}", "project", "odm_orthophoto", - "odm_orthophoto.tif" + "odm_orthophoto.original.tif" ) # 检查TIF文件是否存在 @@ -309,7 +309,7 @@ if __name__ == "__main__": # 创建配置 config = PreprocessConfig( image_dir=r"F:\error_data\20241024100834\code\images", - output_dir=r"G:\20241024100834\output", + output_dir=r"G:\ODM_output\20241024100834\output", cluster_eps=0.01, cluster_min_samples=5, @@ -329,7 +329,7 @@ if __name__ == "__main__": grid_overlap=0.03, - mode="重建模式", + mode="快拼模式", ) # 创建处理器并执行 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..12f3f05 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +numpy +pandas +scikit-learn +matplotlib +piexif +geopy +psutil diff --git a/utils/command_runner.py b/utils/command_runner.py index 26c4f44..280e8d8 100644 --- a/utils/command_runner.py +++ b/utils/command_runner.py @@ -38,9 +38,9 @@ i grid_dir = os.path.join(self.output_dir, f'grid_{grid_idx + 1}') grid_dir = grid_dir[0].lower() + grid_dir[1:].replace('\\', '/') if self.mode == "快拼模式": - command = f"docker run -ti --rm -v {grid_dir}:/datasets opendronemap/odm --project-path /datasets project --feature-quality lowest --force-gps --fast-orthophoto --skip-3dmodel" + command = f"docker run -ti --rm -v {grid_dir}:/datasets opendronemap/odm --project-path /datasets project --max-concurrency 10 --force-gps --feature-quality lowest --orthophoto-resolution 8 --fast-orthophoto --skip-3dmodel" else: - command = f"docker run -ti --rm -v {grid_dir}:/datasets opendronemap/odm --project-path /datasets project --feature-quality lowest --force-gps" + command = f"docker run -ti --rm -v {grid_dir}:/datasets opendronemap/odm --project-path /datasets project --max-concurrency 10 --force-gps" self.logger.info(f"开始执行命令: {command}") success, error_msg = self.monitor.run_odm_with_monitor(