diff --git a/yj_local_build/main_step1.py b/yj_local_build/main_step1.py index 950fcff..f742bcc 100644 --- a/yj_local_build/main_step1.py +++ b/yj_local_build/main_step1.py @@ -89,20 +89,21 @@ def detect_markers(psid, pid): start_time = time.time() textpicCmd ='-selectImage "'+os.path.join(config['workdir'],pid,'photo2')+'\*" -enableTexturingAndColoring true' - #获取当前的工作目录 + #获取当前的工作目录 {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") 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"]} -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 -align -align -detectMarkers "{dirCurr}\detectMarkers_1.5.config.xml" -align\ - -defineDistance 36h11:007 36h11:008 0.21\ - -align -align -update\ - -setReconstructionRegion "{rcboxfile}"\ + -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"a.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"]}\