diff --git a/main_step2.py b/main_step2.py index 52a002d..57f519c 100644 --- a/main_step2.py +++ b/main_step2.py @@ -29,7 +29,7 @@ def make3d(pid): cmd = f'{config.rcbin} {config.r1["init"]} \ -addFolder "{os.path.join(config.workdir, pid, "photo1")}" -addFolder "{os.path.join(config.workdir, pid, "photo2")}" {add_photo3} \ -importControlPointsMeasurements "{os.path.join(config.workdir, pid, f"{pid}.controlPoints.csv")}" \ - -align -save "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}"' + -align -save "{os.path.join(config.workdir, pid, f"{pid}_wait.rcproj")}" ' print(cmd) cmd = shlex.split(cmd) res = subprocess.run(cmd) @@ -37,6 +37,8 @@ def make3d(pid): # defind_distance + time.sleep(20) + shutil.move(os.path.join(config.workdir, pid, f'{pid}_wait.rcproj'), os.path.join(config.workdir, pid, f'{pid}.rcproj')) print(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())} pid: {pid} 定义定位点距离完成') cmd = f'{config.rcbin} {config.r1["init"]} -load "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}" -update \