feat(新功能):
fix(修复bug): print_painting.py 坐标算法修改 docs(文档变更): refactor(重构): test(增加测试): 代码回溯
This commit is contained in:
@@ -79,8 +79,8 @@ class PrintPainting:
|
|||||||
mask = cv2.cvtColor(mask, cv2.COLOR_GRAY2BGR)
|
mask = cv2.cvtColor(mask, cv2.COLOR_GRAY2BGR)
|
||||||
mask = cv2.bitwise_not(mask)
|
mask = cv2.bitwise_not(mask)
|
||||||
|
|
||||||
mask = cv2.resize(mask, (int(result['final_image'].shape[0] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[1] * single_print['print_scale_list'][i][1])))
|
mask = cv2.resize(mask, (int(result['final_image'].shape[1] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[0] * single_print['print_scale_list'][i][1])))
|
||||||
image = cv2.resize(image, (int(result['final_image'].shape[0] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[1] * single_print['print_scale_list'][i][1])))
|
image = cv2.resize(image, (int(result['final_image'].shape[1] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[0] * single_print['print_scale_list'][i][1])))
|
||||||
# 旋转后的坐标需要重新算
|
# 旋转后的坐标需要重新算
|
||||||
rotate_mask, _ = self.img_rotate(mask, single_print['print_angle_list'][i])
|
rotate_mask, _ = self.img_rotate(mask, single_print['print_angle_list'][i])
|
||||||
rotate_image, rotated_new_size = self.img_rotate(image, single_print['print_angle_list'][i])
|
rotate_image, rotated_new_size = self.img_rotate(image, single_print['print_angle_list'][i])
|
||||||
@@ -184,8 +184,8 @@ class PrintPainting:
|
|||||||
mask = np.expand_dims(mask, axis=2)
|
mask = np.expand_dims(mask, axis=2)
|
||||||
mask = cv2.cvtColor(mask, cv2.COLOR_GRAY2BGR)
|
mask = cv2.cvtColor(mask, cv2.COLOR_GRAY2BGR)
|
||||||
mask = cv2.bitwise_not(mask)
|
mask = cv2.bitwise_not(mask)
|
||||||
mask = cv2.resize(mask, (int(result['final_image'].shape[0] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[1] * single_print['print_scale_list'][i][1])))
|
mask = cv2.resize(mask, (int(result['final_image'].shape[1] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[0] * single_print['print_scale_list'][i][1])))
|
||||||
image = cv2.resize(image, (int(result['final_image'].shape[0] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[1] * single_print['print_scale_list'][i][1])))
|
image = cv2.resize(image, (int(result['final_image'].shape[1] * single_print['print_scale_list'][i][0]), int(result['final_image'].shape[0] * single_print['print_scale_list'][i][1])))
|
||||||
# 旋转后的坐标需要重新算
|
# 旋转后的坐标需要重新算
|
||||||
rotate_mask, _ = self.img_rotate(mask, element_print['element_angle_list'][i])
|
rotate_mask, _ = self.img_rotate(mask, element_print['element_angle_list'][i])
|
||||||
rotate_image, rotated_new_size = self.img_rotate(image, element_print['element_angle_list'][i])
|
rotate_image, rotated_new_size = self.img_rotate(image, element_print['element_angle_list'][i])
|
||||||
|
|||||||
Reference in New Issue
Block a user