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

manual_single.py

@@ -107,15 +107,12 @@ def cmd_run(pid,usePhoto = "1",lock=False):
     #将两组图片进行重新对齐 然后重建区域
     psid = libs.getPSid(pid)
     cmd = f'{config.rcbin} -setInstanceName {pid} \
-        -addFolder "{os.path.join(config.workdir, pid, usePhoto)}" \
-        -addFolder "{os.path.join(config.workdir, pid, "photo2")}"\
-        -selectImage "{os.path.join(config.workdir,pid,"photo1")}/*" -enableTexturingAndColoring false \
+        -addFolder "{os.path.join(config.workdir, pid, usePhoto)}" {config.r["setTextureFalse"]}\
+        -addFolder "{os.path.join(config.workdir, pid, "photo2")}" {config.r["setTextureTrue"]}\
         -detectMarkers "D:\\make2\\config\\detectMarkers.config.xml" -align -align -align \
         {libs.get_defineDistances(psid)} -update -align -align {config.r2["setRegion"]} \
         {exportxmp} \
         -exportReconstructionRegion "{os.path.join(config.workdir, pid, f"{pid}.rcbox")}" \
-        -selectImage "{os.path.join(config.workdir,pid,"photo2")}/*" -enableTexturingAndColoring false \
-        -selectImage "{os.path.join(config.workdir,pid,"photo2")}/*" -enableTexturingAndColoring true \
         -save "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}"' 
 
     print(cmd)
@@ -123,11 +120,11 @@ def cmd_run(pid,usePhoto = "1",lock=False):
     res = subprocess.run(cmd)
     print(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())} {pid} step1完成，共费时{libs.diff_time(start_time)}')
     
-    yes_or_not = input('是否step2？(y/n)')
-    if yes_or_not == 'y':
-        pass
-    else:
-        sys.exit(0)# yes_or_not = input('当前该影棚没有对应的对齐坐标,是否创建？(y/n)')
+    # yes_or_not = input('是否step2？(y/n)')
+    # if yes_or_not == 'y':
+    #     pass
+    # else:
+    #     sys.exit(0)# yes_or_not = input('当前该影棚没有对应的对齐坐标,是否创建？(y/n)')
 
 
     #调用step2