1

yj_local_build/main_step1.py

@@ -88,35 +88,35 @@ def detect_markers(psid, pid):
                 print(f"不存在{region_filename}")
     start_time = time.time()
     textpicCmd ='-selectImage "'+os.path.join(config['workdir'],pid,'photo2')+'\*" -enableTexturingAndColoring true'
-
+    textpicCmdFalse ='-selectImage "'+os.path.join(config['workdir'],pid,'photo1')+'\*" -enableTexturingAndColoring false'
     #获取当前的工作目录 {config["r"]["setTextureFalse"]} -setReconstructionRegion "{rcboxfile}"\
     dirCurr = os.getcwd()
     #shutil.copyfile(os.path.join(config['workdir'], 'xmps','stand.rcbox'), os.path.join(config['workdir'], pid,f"{pid}.rcbox"))
-    rcboxfile = os.path.join(config["workdir"], pid, f"{pid}.rcbox")
+    # rcboxfile = os.path.join(config["workdir"], pid, f"{pid}.rcbox")
+    # 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")}" \
+    #     -addFolder "{os.path.join(config["workdir"], pid, "photo2")}" -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
+    #     -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
+    #     -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" -align \
+    #     -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"]} \
+    #     -align -align -update \
+    #     -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")}" \
+    #     -selectImage "{os.path.join(config["workdir"],pid,"photo1")}\*" -enableTexturingAndColoring false \
+    #     {textpicCmd} -save "{os.path.join(config["workdir"], pid, f"{pid}.rcproj")}" -quit'
+
+    #{config["r2"]["setRegion1"]}\
     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")}" \
         -addFolder "{os.path.join(config["workdir"], pid, "photo2")}" -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
-        -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
+        -align -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
-        -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" -align \
         -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"]} \
-        -align -align -update \
+        -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")}" \
-        -selectImage "{os.path.join(config["workdir"],pid,"photo1")}\*" -enableTexturingAndColoring false \
+        {textpicCmd} {textpicCmdFalse}  -save "{os.path.join(config["workdir"], pid, f"{pid}.rcproj")}" -quit'
-        {textpicCmd} -save "{os.path.join(config["workdir"], pid, f"{pid}.rcproj")}" -quit'
-
-    #{config["r2"]["setRegion1"]}\
-    # 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, "photo2")}" -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" \
-    #     -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)