Merge branch 'master' of https://git.suwa3d.com/dongchangxi/make2

yj_local_build/main_step1.py

@@ -93,17 +93,18 @@ def detect_markers(psid, pid):
 
     cmd = f'{config["rcbin"]} {config["r2"]["init"]} -setInstanceName {pid} \
         -save "{os.path.join(config["workdir"], pid, f"{pid}.rcproj")}" \
-        -addFolder "{os.path.join(config["workdir"], pid, "photo1")}" {config["r"]["setTextureFalse"]}\
+        -addFolder "{os.path.join(config["workdir"], pid, "photo1")}" {config["r"]["setTextureFalse"]} \
-        -addFolder "{os.path.join(config["workdir"], pid, "photo2")}" -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml"\
+        -addFolder "{os.path.join(config["workdir"], pid, "photo2")}" -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
-        -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" -align -align -selectAllImages \
+        -align -align -align -align -selectAllImages -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
         -defineDistance 36h11:001 36h11:002 1 -defineDistance 36h11:002 36h11:004 1 -defineDistance 36h11:004 36h11:003 1 -defineDistance 36h11:003 36h11:001 1 -align -align -update {config["r2"]["setRegion"]} \
         -exportXMP "{dirCurr}\exportXMP.1.5.draft.config.xml" \
         -exportControlPointsMeasurements "{os.path.join(config["workdir"], pid, f"{pid}.controlPoints.csv")}" "{dirCurr}\exportControlPoints.config.xml" \
         -exportReconstructionRegion "{os.path.join(config["workdir"], pid, f"{pid}.rcbox")}" \
         {textpicCmd} -save "{os.path.join(config["workdir"], pid, f"{pid}.rcproj")}" -quit'
     print(cmd)
-    cmd = shlex.split(cmd)
+    cmd = shlex.split(cmd)    
     res = subprocess.run(cmd)
+    print("res",res)
     time.sleep(3)
     fix_region()
     print(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())} pid: {pid} 定位点检测完成, 共费时{diff_time(start_time)}')