上传代码
This commit is contained in:
hesuicong committed
1 parent
745a20292d
commit
3775006cf4
7 files changed
+30
-20
No files matched your search
+3
-3
@@ -9,6 +9,7 @@ from download_print import BatchModelInfo
|
||||
from print_factory_type_setting_obj_run import print_type_setting_obj
|
||||
|
||||
from config import print_factory_type_dir
|
||||
from config import oss_config
|
||||
from general import is_run_local_data
|
||||
|
||||
# 如果没有 DISPLAY，自动启动 Xvfb
|
||||
@@ -161,8 +162,8 @@ def main():
|
||||
sys.exit(0)
|
||||
|
||||
def test_main():
|
||||
data= {'machine_print_counts': 150, 'machine_type': 'big_machine', 'pre_batch_id': 9910032, 'print_machine_id': 14, 'print_orders': [{'counts': 1, 'layout_z': 35.62070959151145, 'model_weight': 41.862, 'order_id': 917900, 'pid': 376666, 'print_id': 126318}, {'counts': 1, 'layout_z': 31.380497732946978, 'model_weight': 35.158, 'order_id': 917810, 'pid': 376562, 'print_id': 126413}, {'counts': 1, 'layout_z': 26.136854969886777, 'model_weight': 21.403, 'order_id': 917820, 'pid': 376572, 'print_id': 126414}, {'counts': 1, 'layout_z': 37.967177899738104, 'model_weight': 30.48, 'order_id': 917922, 'pid': 376684, 'print_id': 126415}, {'counts': 1, 'layout_z': 20.368887098446734, 'model_weight': 13.097, 'order_id': 918228, 'pid': 377198, 'print_id': 126417}, {'counts': 1, 'layout_z': 21.4227336927951, 'model_weight': 15.859, 'order_id': 917576, 'pid': 376345, 'print_id': 126769}, {'counts': 1, 'layout_z': 27.539947066784066, 'model_weight': 25.185, 'order_id': 917811, 'pid': 376564, 'print_id': 126875}, {'counts': 1, 'layout_z': 31.692723822970393, 'model_weight': 32.796, 'order_id': 917821, 'pid': 376592, 'print_id': 126876}, {'counts': 1, 'layout_z': 20.20031720146163, 'model_weight': 8.664, 'order_id': 917822, 'pid': 376602, 'print_id': 126877}, {'counts': 1, 'layout_z': 22.41680629925537, 'model_weight': 15.206, 'order_id': 917827, 'pid': 376616, 'print_id': 126878}, {'counts': 1, 'layout_z': 25.443981671314514, 'model_weight': 11.965, 'order_id': 917879, 'pid': 376635, 'print_id': 126879}, {'counts': 1, 'layout_z': 31.09222672704002, 'model_weight': 20.318, 'order_id': 917902, 'pid': 376667, 'print_id': 126882}, {'counts': 1, 'layout_z': 30.3317820592175, 'model_weight': 32.964, 'order_id': 917903, 'pid': 376668, 'print_id': 126884}, {'counts': 1, 'layout_z': 28.69639626624317, 'model_weight': 27.751, 'order_id': 917904, 'pid': 376669, 'print_id': 126885}, {'counts': 1, 'layout_z': 28.043180029163203, 'model_weight': 19.866, 'order_id': 917917, 'pid': 376677, 'print_id': 126886}, {'counts': 1, 'layout_z': 28.58783468947201, 'model_weight': 25.505, 'order_id': 918196, 'pid': 377126, 'print_id': 126888}, {'counts': 1, 'layout_z': 43.55871899466554, 'model_weight': 63.512, 'order_id': 918201, 'pid': 377131, 'print_id': 126890}, {'counts': 1, 'layout_z': 32.52479624889478, 'model_weight': 22.943, 'order_id': 918203, 'pid': 377133, 'print_id': 126891}, {'counts': 1, 'layout_z': 33.21834123013511, 'model_weight': 42.163, 'order_id': 918206, 'pid': 377139, 'print_id': 126892}, {'counts': 1, 'layout_z': 27.81674335447885, 'model_weight': 15.455, 'order_id': 918207, 'pid': 377141, 'print_id': 126893}, {'counts': 1, 'layout_z': 29.78203639784899, 'model_weight': 29.696, 'order_id': 918231, 'pid': 377201, 'print_id': 126894}, {'counts': 1, 'layout_z': 23.66875736859606, 'model_weight': 13.39, 'order_id': 915637, 'pid': 373135, 'print_id': 126895}, {'counts': 1, 'layout_z': 29.00408914521088, 'model_weight': 19.553, 'order_id': 918246, 'pid': 377209, 'print_id': 126897}, {'counts': 1, 'layout_z': 24.44397251338635, 'model_weight': 15.424, 'order_id': 918325, 'pid': 376974, 'print_id': 126899}, {'counts': 1, 'layout_z': 31.755406379699707, 'model_weight': 31.131, 'order_id': 918492, 'pid': 377584, 'print_id': 126900}, {'counts': 1, 'layout_z': 38.03699946264237, 'model_weight': 47.412, 'order_id': 918493, 'pid': 377587, 'print_id': 126901}, {'counts': 1, 'layout_z': 43.52919799223749, 'model_weight': 37.842, 'order_id': 918494, 'pid': 377589, 'print_id': 126902}, {'counts': 1, 'layout_z': 25.906302369108843, 'model_weight': 18.64, 'order_id': 918495, 'pid': 377590, 'print_id': 126903}, {'counts': 1, 'layout_z': 36.02611978829816, 'model_weight': 43.814, 'order_id': 918496, 'pid': 377591, 'print_id': 126904}, {'counts': 1, 'layout_z': 26.020689766262052, 'model_weight': 18.513, 'order_id': 918497, 'pid': 377594, 'print_id': 126905}, {'counts': 1, 'layout_z': 23.988078117370605, 'model_weight': 15.753, 'order_id': 918498, 'pid': 377596, 'print_id': 126906}, {'counts': 1, 'layout_z': 27.457814063914604, 'model_weight': 23.507, 'order_id': 918500, 'pid': 377601, 'print_id': 126908}, {'counts': 1, 'layout_z': 29.306090320672993, 'model_weight': 25.043, 'order_id': 918501, 'pid': 377605, 'print_id': 126909}, {'counts': 1, 'layout_z': 29.070231478924583, 'model_weight': 25.598, 'order_id': 918504, 'pid': 377606, 'print_id': 126910}, {'counts': 1, 'layout_z': 24.314504768436095, 'model_weight': 18.68, 'order_id': 918555, 'pid': 377684, 'print_id': 126911}, {'counts': 1, 'layout_z': 37.52979171030315, 'model_weight': 53.541, 'order_id': 918558, 'pid': 377689, 'print_id': 126913}, {'counts': 1, 'layout_z': 26.530791960490333, 'model_weight': 15.082, 'order_id': 918560, 'pid': 377702, 'print_id': 126915}, {'counts': 1, 'layout_z': 23.604568481445312, 'model_weight': 21.614, 'order_id': 918583, 'pid': 377748, 'print_id': 126917}, {'counts': 1, 'layout_z': 27.865868478825355, 'model_weight': 22.6, 'order_id': 918636, 'pid': 377819Line truncated
|
||||
# data= {"machine_print_counts":50, 'machine_type': 'small_machine',"pre_batch_id":991112,"print_machine_id":22,"print_orders":[{"counts":1,"layout_z":3.543965775898459,"model_weight":12.833,"order_id":857420,"pid":268473,"print_id":85240},{"counts":1,"layout_z":7.798861189952786,"model_weight":13.784,"order_id":875986,"pid":305425,"print_id":88136}]}
|
||||
# data= {'machine_print_counts': 150, 'machine_type': 'big_machine', 'pre_batch_id': 9910032, 'print_machine_id': 14, 'print_orders': [{'counts': 1, 'layout_z': 35.62070959151145, 'model_weight': 41.862, 'order_id': 917900, 'pid': 376666, 'print_id': 126318}, {'counts': 1, 'layout_z': 31.380497732946978, 'model_weight': 35.158, 'order_id': 917810, 'pid': 376562, 'print_id': 126413}, {'counts': 1, 'layout_z': 26.136854969886777, 'model_weight': 21.403, 'order_id': 917820, 'pid': 376572, 'print_id': 126414}, {'counts': 1, 'layout_z': 37.967177899738104, 'model_weight': 30.48, 'order_id': 917922, 'pid': 376684, 'print_id': 126415}, {'counts': 1, 'layout_z': 20.368887098446734, 'model_weight': 13.097, 'order_id': 918228, 'pid': 377198, 'print_id': 126417}, {'counts': 1, 'layout_z': 21.4227336927951, 'model_weight': 15.859, 'order_id': 917576, 'pid': 376345, 'print_id': 126769}, {'counts': 1, 'layout_z': 27.539947066784066, 'model_weight': 25.185, 'order_id': 917811, 'pid': 376564, 'print_id': 126875}, {'counts': 1, 'layout_z': 31.692723822970393, 'model_weight': 32.796, 'order_id': 917821, 'pid': 376592, 'print_id': 126876}, {'counts': 1, 'layout_z': 20.20031720146163, 'model_weight': 8.664, 'order_id': 917822, 'pid': 376602, 'print_id': 126877}, {'counts': 1, 'layout_z': 22.41680629925537, 'model_weight': 15.206, 'order_id': 917827, 'pid': 376616, 'print_id': 126878}, {'counts': 1, 'layout_z': 25.443981671314514, 'model_weight': 11.965, 'order_id': 917879, 'pid': 376635, 'print_id': 126879}, {'counts': 1, 'layout_z': 31.09222672704002, 'model_weight': 20.318, 'order_id': 917902, 'pid': 376667, 'print_id': 126882}, {'counts': 1, 'layout_z': 30.3317820592175, 'model_weight': 32.964, 'order_id': 917903, 'pid': 376668, 'print_id': 126884}, {'counts': 1, 'layout_z': 28.69639626624317, 'model_weight': 27.751, 'order_id': 917904, 'pid': 376669, 'print_id': 126885}, {'counts': 1, 'layout_z': 28.043180029163203, 'model_weight': 19.866, 'order_id': 917917, 'pid': 376677, 'print_id': 126886}, {'counts': 1, 'layout_z': 28.58783468947201, 'model_weight': 25.505, 'order_id': 918196, 'pid': 377126, 'print_id': 126888}, {'counts': 1, 'layout_z': 43.55871899466554, 'model_weight': 63.512, 'order_id': 918201, 'pid': 377131, 'print_id': 126890}, {'counts': 1, 'layout_z': 32.52479624889478, 'model_weight': 22.943, 'order_id': 918203, 'pid': 377133, 'print_id': 126891}, {'counts': 1, 'layout_z': 33.21834123013511, 'model_weight': 42.163, 'order_id': 918206, 'pid': 377139, 'print_id': 126892}, {'counts': 1, 'layout_z': 27.81674335447885, 'model_weight': 15.455, 'order_id': 918207, 'pid': 377141, 'print_id': 126893}, {'counts': 1, 'layout_z': 29.78203639784899, 'model_weight': 29.696, 'order_id': 918231, 'pid': 377201, 'print_id': 126894}, {'counts': 1, 'layout_z': 23.66875736859606, 'model_weight': 13.39, 'order_id': 915637, 'pid': 373135, 'print_id': 126895}, {'counts': 1, 'layout_z': 29.00408914521088, 'model_weight': 19.553, 'order_id': 918246, 'pid': 377209, 'print_id': 126897}, {'counts': 1, 'layout_z': 24.44397251338635, 'model_weight': 15.424, 'order_id': 918325, 'pid': 376974, 'print_id': 126899}, {'counts': 1, 'layout_z': 31.755406379699707, 'model_weight': 31.131, 'order_id': 918492, 'pid': 377584, 'print_id': 126900}, {'counts': 1, 'layout_z': 38.03699946264237, 'model_weight': 47.412, 'order_id': 918493, 'pid': 377587, 'print_id': 126901}, {'counts': 1, 'layout_z': 43.52919799223749, 'model_weight': 37.842, 'order_id': 918494, 'pid': 377589, 'print_id': 126902}, {'counts': 1, 'layout_z': 25.906302369108843, 'model_weight': 18.64, 'order_id': 918495, 'pid': 377590, 'print_id': 126903}, {'counts': 1, 'layout_z': 36.02611978829816, 'model_weight': 43.814, 'order_id': 918496, 'pid': 377591, 'print_id': 126904}, {'counts': 1, 'layout_z': 26.020689766262052, 'model_weight': 18.513, 'order_id': 918497, 'pid': 377594, 'print_id': 126905}, {'counts': 1, 'layout_z': 23.988078117370605, 'model_weight': 15.753, 'order_id': 918498, 'pid': 377596, 'print_id': 126906}, {'counts': 1, 'layout_z': 27.457814063914604, 'model_weight': 23.507, 'order_id': 918500, 'pid': 377601, 'print_id': 126908}, {'counts': 1, 'layout_z': 29.306090320672993, 'model_weight': 25.043, 'order_id': 918501, 'pid': 377605, 'print_id': 126909}, {'counts': 1, 'layout_z': 29.070231478924583, 'model_weight': 25.598, 'order_id': 918504, 'pid': 377606, 'print_id': 126910}, {'counts': 1, 'layout_z': 24.314504768436095, 'model_weight': 18.68, 'order_id': 918555, 'pid': 377684, 'print_id': 126911}, {'counts': 1, 'layout_z': 37.52979171030315, 'model_weight': 53.541, 'order_id': 918558, 'pid': 377689, 'print_id': 126913}, {'counts': 1, 'layout_z': 26.530791960490333, 'model_weight': 15.082, 'order_id': 918560, 'pid': 377702, 'print_id': 126915}, {'counts': 1, 'layout_z': 23.604568481445312, 'model_weight': 21.614, 'order_id': 918583, 'pid': 377748, 'print_id': 126917}, {'counts': 1, 'layout_z': 27.865868478825355, 'model_weight': 22.6, 'order_id': 918636, 'pid': 3778Line truncated
|
||||
data= {"machine_print_counts":50, 'machine_type': 'small_machine',"pre_batch_id":991112,"print_machine_id":22,"print_orders":[{"counts":1,"layout_z":3.543965775898459,"model_weight":12.833,"order_id":857420,"pid":268473,"print_id":85240},{"counts":1,"layout_z":7.798861189952786,"model_weight":13.784,"order_id":875986,"pid":305425,"print_id":88136}]}
|
||||
|
||||
process_clound_print(data)
|
||||
|
||||
@@ -302,7 +303,6 @@ def process_clound_print(data):
|
||||
print("-" * 40)
|
||||
|
||||
workdir = f"{print_factory_type_dir}/data/{pre_batch_id}"
|
||||
oss_config = f"{print_factory_type_dir}/print_factory_type_setting_big/download_print/run.yaml"
|
||||
|
||||
clear_directory_recursive(f"{print_factory_type_dir}/data/")
|
||||
clear_directory_recursive(f"{print_factory_type_dir}/full/")
|
||||
|
||||
+11
-7
@@ -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
|
||||
|
||||
@@ -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]
|
||||
|
||||
# -------------------------- 结束：机台尺寸 -------------------------------
|
||||
+2
-2
@@ -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)
|
||||
|
||||
+2
-2
@@ -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")
|
||||
|
||||
# -------------------------- 结束：模型 ----------------------------------
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user