影棚与地贴的关联 和 走新建模系统 通过数据库来连接

main_step1.py

@@ -66,7 +66,7 @@ def detect_markers(psid, pid):
         -addFolder "{os.path.join(config.workdir, pid, "photo1")}" {config.r["setTextureFalse"]} -align -addFolder "{os.path.join(config.workdir, pid, "photo2")}" \
         {add_photo3} -align -selectAllImages \
         -detectMarkers "D:\\make2\\config\\detectMarkers.config.xml" \
-        {libs.get_defineDistances(config.ps_floor_sticker.get(psid, config.ps_floor_sticker["default"]))} -align -align -update {config.r2["setRegion"]} \
+        {libs.get_defineDistances(psid)} -align -align -update {config.r2["setRegion"]} \
         -exportXMP "D:\\make2\\config\\exportXMP.config.xml" \
         -exportControlPointsMeasurements "{os.path.join(config.workdir, pid, f"{pid}.controlPoints.csv")}" "D:\\make2\\config\\exportControlPoints.config.xml" \
         -exportReconstructionRegion "{os.path.join(config.workdir, pid, f"{pid}.rcbox")}" \
@@ -99,7 +99,7 @@ def cal_reconstruction_region(psid, pid):
     cmd = f'{config.rcbin} {config.r2["init"]} -setInstanceName {pid} \
         -load "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}" \
         -addFolder "{os.path.join(config.workdir, pid, "photo2")}" -align {add_photo3} \
-        -detectMarkers "D:\\make2\\config\\detectMarkers.config.xml" {libs.get_defineDistances(config.ps_floor_sticker.get(psid, config.ps_floor_sticker["default"]))} -align -align \
+        -detectMarkers "D:\\make2\\config\\detectMarkers.config.xml" {libs.get_defineDistances(psid)} -align -align \
         -update {config.r2["setRegion"]} \
         -exportControlPointsMeasurements "{os.path.join(config.workdir, pid, f"{pid}.controlPoints.csv")}" "D:\\make2\\config\\exportControlPoints.config.xml" \
         -selectAllImages -exportXMP "D:\\make2\\config\\exportXMP.config.xml" \