From e4805e9853c0e74d7e042e4112a9323cfe67aa85 Mon Sep 17 00:00:00 2001 From: dongchangxi <458593490@qq.com> Date: Thu, 6 Feb 2025 21:38:31 +0800 Subject: [PATCH] 1 --- yj_local_build/main_step1.py | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/yj_local_build/main_step1.py b/yj_local_build/main_step1.py index e24c55f..1a46c5a 100644 --- a/yj_local_build/main_step1.py +++ b/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 -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" -align \ + -align -align -align -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"]} \ - -align -align -update \ - -exportControlPointsMeasurements "{os.path.join(config["workdir"], pid, f"{pid}.controlPoints.csv")}" "{dirCurr}\exportControlPoints.config.xml"\ + -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} -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' + {textpicCmd} {textpicCmdFalse} -save "{os.path.join(config["workdir"], pid, f"{pid}.rcproj")}" -quit' print(cmd) cmd = shlex.split(cmd)