diff --git a/.gitignore b/.gitignore index 3eee42b..775aa57 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ **/__pycache__/ *.pyc *.pyo -*.pyd \ No newline at end of file +*.pyd + +test/ \ No newline at end of file diff --git a/odm_preprocess.py b/odm_preprocess.py index 1a5f858..00d3ac7 100644 --- a/odm_preprocess.py +++ b/odm_preprocess.py @@ -29,7 +29,7 @@ class PreprocessConfig: filter_distance_threshold: float = 0.001 filter_min_neighbors: int = 6 grid_overlap: float = 0.05 - grid_size: float = 250 + grid_size: float = 500 enable_filter: bool = True enable_grid_division: bool = True enable_visualization: bool = True @@ -200,8 +200,8 @@ class ImagePreprocessor: self.cluster() # self.time_filter() # self.filter_points() - # grid_points = self.divide_grids() - # self.copy_images(grid_points) + grid_points = self.divide_grids() + self.copy_images(grid_points) self.visualize_results() # self.logger.info("预处理任务完成") # self.command_runner.run_grid_commands( @@ -223,6 +223,7 @@ if __name__ == "__main__": filter_distance_threshold=0.001, filter_min_neighbors=6, grid_overlap=0.05, + grid_size=500, enable_filter=True, enable_grid_division=True, enable_visualization=True, diff --git a/preprocess/grid_divider.py b/preprocess/grid_divider.py index c7bdb51..e51332c 100644 --- a/preprocess/grid_divider.py +++ b/preprocess/grid_divider.py @@ -9,7 +9,7 @@ class GridDivider: self.logger = logging.getLogger('UAV_Preprocess.GridDivider') self.logger.info(f"初始化网格划分器,重叠率: {overlap}") - def divide_grids(self, points_df, grid_size=250): + def divide_grids(self, points_df, grid_size=500): """计算边界框并划分九宫格""" self.logger.info("开始划分九宫格") diff --git a/test/del_imgs.txt b/test/del_imgs.txt deleted file mode 100644 index 0a30ba1..0000000 --- a/test/del_imgs.txt +++ /dev/null @@ -1,21 +0,0 @@ -0097ad48530f4ae1af34c48e281aaf3d.jpg -1568ec834f2a4b119ef3292dc31dfa4d.jpg -181afdbcba774f769ab2fc4bb8064f3e.jpg -23ba09a2cf2240728c4ba60068352864.jpg -41099dc566814ddf96cf4e1c0d2bcea6.jpg -4213c5dd18784272a983a9a14e2944a4.jpg -54e5e0ad38f14ad48c82a15ccf3c7337.jpg -554e893c3dc5400fa9e9d282b7f333a3.jpg -743be156d28b4fd783508bf1897e7184.jpg -8a226f7400244b6a87d170bed292b719.jpg -94a05fc70d284c7282c332c90c6e28bf.jpg -bbe3e6dd7c354d5f9352d46078369f1d.jpg -bfd5e60af76243c29c217220e08f2559.jpg -d4f55a5f91e84df3a7f38e02363e8f5f.jpg -e024f299df454e5e87e2954754035966.jpg -e6bd58b1639140b3b2aa90cf0c12eaaf.jpg -eb35f2f429f84579b73ad47d7fe0e152.jpg -f1aa2a76d56c4904bf15de3ae4694821.jpg -f3c7ba174f8a427c9383dc4fcc3b2c72.jpg -fe94e1ff5dff4a0abe62f9e63f9f9340.jpg - diff --git a/test/filter_GPS.png b/test/filter_GPS.png deleted file mode 100644 index 50376f1..0000000 Binary files a/test/filter_GPS.png and /dev/null differ diff --git a/test/logs/preprocess_20241220_203818.log b/test/logs/preprocess_20241220_203818.log deleted file mode 100644 index ed5d4f0..0000000 --- a/test/logs/preprocess_20241220_203818.log +++ /dev/null @@ -1,6 +0,0 @@ -2024-12-20 20:38:18 - UAV_Preprocess - INFO - 开始提取GPS数据 -2024-12-20 20:38:18 - UAV_Preprocess.GPSExtractor - INFO - 开始从目录提取GPS坐标和拍摄日期: E:\湖南省第二测绘院\11-06-项目移交文件(王辉给)\无人机二三维节点扩容生产影像\影像数据\199\code\images -2024-12-20 20:38:24 - UAV_Preprocess.GPSExtractor - INFO - GPS坐标和拍摄日期提取完成 - 总图片数: 199, 成功提取: 199, 失败: 0 -2024-12-20 20:38:24 - UAV_Preprocess - INFO - 成功提取 199 个GPS点 -2024-12-20 20:38:24 - UAV_Preprocess - INFO - 开始聚类 -2024-12-20 20:38:24 - UAV_Preprocess - INFO - 聚类完成:主要类别包含 179 个点,噪声点 20 个 diff --git a/test/logs/preprocess_20241220_205329.log b/test/logs/preprocess_20241220_205329.log deleted file mode 100644 index 63d83a1..0000000 --- a/test/logs/preprocess_20241220_205329.log +++ /dev/null @@ -1,10 +0,0 @@ -2024-12-20 20:53:29 - UAV_Preprocess - INFO - 开始提取GPS数据 -2024-12-20 20:53:29 - UAV_Preprocess.GPSExtractor - INFO - 开始从目录提取GPS坐标和拍摄日期: E:\湖南省第二测绘院\11-06-项目移交文件(王辉给)\无人机二三维节点扩容生产影像\影像数据\199\code\images -2024-12-20 20:53:29 - UAV_Preprocess.GPSExtractor - INFO - GPS坐标和拍摄日期提取完成 - 总图片数: 199, 成功提取: 199, 失败: 0 -2024-12-20 20:53:29 - UAV_Preprocess - INFO - 成功提取 199 个GPS点 -2024-12-20 20:53:29 - UAV_Preprocess - INFO - 开始聚类 -2024-12-20 20:53:29 - UAV_Preprocess - INFO - 聚类完成:主要类别包含 179 个点,噪声点 20 个 -2024-12-20 20:53:29 - UAV_Preprocess - INFO - 开始生成可视化结果 -2024-12-20 20:53:29 - UAV_Preprocess.GPSExtractor - INFO - 开始从目录提取GPS坐标和拍摄日期: E:\湖南省第二测绘院\11-06-项目移交文件(王辉给)\无人机二三维节点扩容生产影像\影像数据\199\code\images -2024-12-20 20:53:29 - UAV_Preprocess.GPSExtractor - INFO - GPS坐标和拍摄日期提取完成 - 总图片数: 199, 成功提取: 199, 失败: 0 -2024-12-20 20:53:30 - UAV_Preprocess - INFO - 预处理结果图已保存