From 5549b15244f4ee83682cb5c0be80223a325576b1 Mon Sep 17 00:00:00 2001
From: weixin_46229132 <weixin_46229132@noreply.gitcode.com>
Date: Tue, 6 May 2025 19:29:24 +0800
Subject: [PATCH] =?UTF-8?q?conv=5Fobj=E6=94=B9=E6=88=90=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_plugin.py         |  2 +-
 post_pro/conv_obj2.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app_plugin.py b/app_plugin.py
index 5d81657..825d31f 100644
--- a/app_plugin.py
+++ b/app_plugin.py
@@ -12,7 +12,7 @@ from utils.grid_divider import GridDivider
 from utils.logger import setup_logger
 from utils.visualizer import FilterVisualizer
 from post_pro.merge_tif import MergeTif
-from post_pro.conv_obj import ConvertOBJ
+from post_pro.conv_obj2 import ConvertOBJ
 
 
 @dataclass
diff --git a/post_pro/conv_obj2.py b/post_pro/conv_obj2.py
index 41d7ff7..38e92a8 100644
--- a/post_pro/conv_obj2.py
+++ b/post_pro/conv_obj2.py
@@ -18,13 +18,13 @@ class ConvertOBJ:
             "EPSG:32649", "EPSG:4326", always_xy=True)
         self.logger = logging.getLogger('UAV_Preprocess.ConvertOBJ')
 
-    def convert_grid_obj(self, grid_points):
+    def convert_grid_obj(self, grid_lt):
         """转换每个网格的OBJ文件为OSGB格式"""
         os.makedirs(os.path.join(self.output_dir,
                     "osgb", "Data"), exist_ok=True)
 
         # 以第一个grid的UTM坐标作为参照系
-        first_grid_id = list(grid_points.keys())[0]
+        first_grid_id = grid_lt[0]
         first_grid_dir = os.path.join(
             self.output_dir,
             f"grid_{first_grid_id[0]}_{first_grid_id[1]}",
@@ -34,15 +34,15 @@ class ConvertOBJ:
             first_grid_dir, "odm_orthophoto", "odm_orthophoto_log.txt")
         self.ref_east, self.ref_north = self.read_utm_offset(log_file)
 
-        for grid_id in grid_points.keys():
+        for grid_id in grid_lt:
             try:
-                self._convert_single_grid(grid_id, grid_points)
+                self._convert_single_grid(grid_id)
             except Exception as e:
                 self.logger.error(f"网格 {grid_id} 转换失败: {str(e)}")
 
         self._create_merged_metadata()
 
-    def _convert_single_grid(self, grid_id, grid_points):
+    def _convert_single_grid(self, grid_id):
         """转换单个网格的OBJ文件"""
         # 构建相关路径
         grid_name = f"grid_{grid_id[0]}_{grid_id[1]}"