feat(新功能):

fix(修复bug):  print_painting.py 坐标算法修改
docs(文档变更):
refactor(重构):
test(增加测试):

代码回溯
This commit is contained in:
zhouchengrong
2025-02-07 16:46:42 +08:00
parent ab7534e2c5
commit b3bd433b2c

View File

@@ -53,9 +53,6 @@ class PrintPainting:
print_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8) print_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8)
mask_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8) mask_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8)
for i in range(len(single_print['print_path_list'])): for i in range(len(single_print['print_path_list'])):
if not (result['resize_scale'][0] == 1.0 and result['resize_scale'][1] == 1.0):
single_print['location'][i] = (int(single_print['location'][i][0] * result['resize_scale'][0]), int(single_print['location'][i][1] * result['resize_scale'][1]))
image, image_mode = self.read_image(single_print['print_path_list'][i]) image, image_mode = self.read_image(single_print['print_path_list'][i])
if image_mode == "RGBA": if image_mode == "RGBA":
new_size = (int(result['pattern_image'].shape[1] * single_print['print_scale_list'][i][0]), int(result['pattern_image'].shape[0] * single_print['print_scale_list'][i][1])) new_size = (int(result['pattern_image'].shape[1] * single_print['print_scale_list'][i][0]), int(result['pattern_image'].shape[0] * single_print['print_scale_list'][i][1]))
@@ -163,8 +160,6 @@ class PrintPainting:
print_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8) print_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8)
mask_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8) mask_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8)
for i in range(len(element_print['element_path_list'])): for i in range(len(element_print['element_path_list'])):
if not (result['resize_scale'][0] == 1.0 and result['resize_scale'][1] == 1.0):
element_print['location'][i] = (int(element_print['location'][i][0] * result['resize_scale'][0]), int(element_print['location'][i][1] * result['resize_scale'][1]))
image, image_mode = self.read_image(element_print['element_path_list'][i]) image, image_mode = self.read_image(element_print['element_path_list'][i])
if image_mode == "RGBA": if image_mode == "RGBA":
new_size = (int(result['final_image'].shape[1] * element_print['element_scale_list'][i][0]), int(result['final_image'].shape[0] * element_print['element_scale_list'][i][1])) new_size = (int(result['final_image'].shape[1] * element_print['element_scale_list'][i][0]), int(result['final_image'].shape[0] * element_print['element_scale_list'][i][1]))