上传代码

compute_print_net.py

@@ -6,7 +6,7 @@ import argparse
 
 from general import *
 
-# -------------------------- 开始：获取bbox数据 -------------------------
+# ------------------------ 开始：对外接口，获取bbox数据 --------------------
 
 """
 对外部提供的获取bbox数据的接口
@@ -16,16 +16,20 @@ compute_bbox_out
     obj_path, 模型数据路径
 
 返回:
-    total_matrix: 旋转矩阵
-    z_max: z最高点
-    min_bound:bbox最低点, 例如[-1.0, -1.0, 0.0]
-    max_bound:bbox最低点, 例如[0.0, 0.0, 1.0]
+    total_matrix: 旋转矩阵, 16位浮点型, 例如, [[  0.13644984   0.99064698   0.         -49.71074343]
+                                            [ -0.99064698   0.13644984   0.         -28.80249299]
+                                            [  0.           0.           1.           3.26326203]
+                                            [  0.           0.           0.           1.        ]]
+    z_max       : z最高点, 1位浮点型, 例如, 1.0
+    min_bound   : bbox最低点, 3位浮点型, 例如, [-1.0, -1.0, 0.0]
+    max_bound   : bbox最低点, 3位浮点型, 例如, [0.0, 0.0, 1.0]
+    ply_name    : ply的名字, 字符串, 例如, 857420_268473_P85240_5cm_x1=9.41+49.997+49.997.ply
 """
 
 def compute_bbox_out(mesh_obj):
     return compute_bbox_ext(mesh_obj)
 
-# -------------------------- 结束：获取bbox数据 --------------------------
+# -------------------------- 结束：对外接口，获取bbox数据 ----------------
 
 # -------------------------- 开始：获取z值最低 --------------------------
 
@@ -428,7 +432,7 @@ def compute_bbox_all(dict_mesh_obj,is_downsample):
         dict_total_matrix[obj_name] = total_matrix
         dict_pcd_fix[ply_name] = pcd_fix
 
-        print(f"compute_bbox {obj_name} pcd_fix={pcd_fix} time={time.time()-start_time}")
+        print(f"compute_bbox obj_name={obj_name} ply_name={ply_name} time={time.time()-start_time}")
 
     # dict_mesh_obj.clear()
     # del dict_mesh_obj

config.py

@@ -1,5 +1,6 @@
 
 # -------------------------- 开始：运行模式 -------------------------------
+
 from enum import Enum
 class run_mode(Enum):
     formal = 1
@@ -8,17 +9,23 @@ class run_mode(Enum):
 
 # !!！谨慎选择run_mode.fix，这将把修复的数据上传到正式的系统 !!！
 curr_run_mode = run_mode.test
+
 # -------------------------- 结束：运行模式 -------------------------------
 
 
 # -------------------------- 开始：路径配置 -------------------------------
-# print_factory_type_dir="/root/print_factory_type"
-print_factory_type_dir="/home/algo/Documents/print_factory_type"
+
+# print_factory_type_dir="/home/ecs-user/git/"
+print_factory_type_dir = "/home/algo/Documents/print_factory_type/git"
+oss_config = f"{print_factory_type_dir}/print_setting/download_print/run.yaml"
+
 url_send_layout = 'https://mp.api.suwa3d.com/api/printTypeSettingOrder/printTypeSettingOrderSuccess'
-# -------------------------- 结束：路径配置 -------------------------------
 
+# -------------------------- 结束：路径配置 -------------------------------
 
 # -------------------------- 开始：机台尺寸 -------------------------------
+
 big_machine_size = [600, 500, 300]
 small_machine_size = [380, 345, 250]
+
 # -------------------------- 结束：机台尺寸 -------------------------------

download_print.py

@@ -14,6 +14,7 @@ import os
 import argparse
 
 from config import print_factory_type_dir
+from config import oss_config
 
 from general import is_use_debug_oss
 from general import transform_save_o3d
@@ -1474,10 +1475,9 @@ if __name__ == "__main__":
         batch_id = 10118 
 
         # workdir = args.workdir
-        workdir = f"{print_factory_type_dir}/{batch_id}"
+        workdir = f"{print_factory_type_dir}/data/{batch_id}"
 
         # oss_config = args.oss_config
-        oss_config = f"{print_factory_type_dir}/print_factory_type_setting_big/download_print/run.yaml" 
 
         if is_transform_save:
             download_transform_save_by_batch(batch_id, workdir, oss_config)

general.py

@@ -267,9 +267,9 @@ def is_same_obj(obj_name1, obj_name2):
 
 def get_blank_path(is_small_machine=False):
     if is_small_machine:
-        return os.path.join(print_factory_type_dir, "blank/blank_bias/blank_small.obj")
+        return os.path.join(print_factory_type_dir, "print_setting/blank/blank_small.obj")
     else:
-        return os.path.join(print_factory_type_dir, "blank/blank_bias/blank2.obj")
+        return os.path.join(print_factory_type_dir, "print_setting/blank/blank_big.obj")
 
 # -------------------------- 结束：模型 ----------------------------------
 

print_factory_type_setting_obj_run.py

@@ -16,6 +16,7 @@ from config import print_factory_type_dir
 from config import url_send_layout
 from config import big_machine_size
 from config import small_machine_size
+from config import oss_config
 
 from general import need_upload_result
 from general import get_blank_path
@@ -144,8 +145,6 @@ def print_type_setting_obj(base_original_obj_dir=None,batch_id=0,selected_mode="
     is_upload_result = True
     if is_upload_result:
         print(f"执行上 传-parent_dir={print_factory_type_dir},base_original_obj_dir={base_original_obj_dir},batch_id={batch_id}")
-        # oss_config = f"{base_original_obj_dir}/../print_factory_type_setting_big/download_print/run.yaml"
-        oss_config = f"{print_factory_type_dir}/print_factory_type_setting_big/download_print/run.yaml"
 
         upload_result(base_original_obj_dir, oss_config, batch_id)
 

test_load_json.py

@@ -491,7 +491,7 @@ if __name__ == "__main__":
     # batch_id = args.batch_id
     batch_id = "9910032"
 
-    base_path = f"{print_factory_type_dir}/{batch_id}/" 
+    base_path = f"{print_factory_type_dir}/data/{batch_id}/" 
 
     load_show_save(base_path, {}, batch_id, False)