feat oss替换为S3
fix
This commit is contained in:
@@ -204,7 +204,7 @@ class PrintPainting(object):
|
|||||||
result['print_image'] = result['pattern_image']
|
result['print_image'] = result['pattern_image']
|
||||||
# print
|
# print
|
||||||
else:
|
else:
|
||||||
if result['print']['print_angle_list'][0] != 0:
|
if "print_angle_list" in result['print'].keys() and result['print']['print_angle_list'][0] != 0:
|
||||||
painting_dict = self.painting_collection(painting_dict, result, print_trigger=True)
|
painting_dict = self.painting_collection(painting_dict, result, print_trigger=True)
|
||||||
painting_dict['tile_print'] = self.rotate_crop_image(img=painting_dict['tile_print'], angle=-result['print']['print_angle_list'][0], crop=True)
|
painting_dict['tile_print'] = self.rotate_crop_image(img=painting_dict['tile_print'], angle=-result['print']['print_angle_list'][0], crop=True)
|
||||||
painting_dict['mask_inv_print'] = self.rotate_crop_image(img=painting_dict['mask_inv_print'], angle=-result['print']['print_angle_list'][0], crop=True)
|
painting_dict['mask_inv_print'] = self.rotate_crop_image(img=painting_dict['mask_inv_print'], angle=-result['print']['print_angle_list'][0], crop=True)
|
||||||
@@ -361,7 +361,7 @@ class PrintPainting(object):
|
|||||||
if not print_['IfSingle']:
|
if not print_['IfSingle']:
|
||||||
self.random_seed = random.randint(0, 1000)
|
self.random_seed = random.randint(0, 1000)
|
||||||
# 如果print 模式为overall 且 有角度的话 , 组合的print为正方形,方便裁剪
|
# 如果print 模式为overall 且 有角度的话 , 组合的print为正方形,方便裁剪
|
||||||
if result['print']['print_angle_list'][0] != 0:
|
if "print_angle_list" in result['print'].keys() and result['print']['print_angle_list'][0] != 0:
|
||||||
painting_dict['mask_inv_print'] = self.tile_image(single_mask_inv_print, dim_pattern, print_['scale'], dim_max, dim_max, painting_dict['location'], trigger=True)
|
painting_dict['mask_inv_print'] = self.tile_image(single_mask_inv_print, dim_pattern, print_['scale'], dim_max, dim_max, painting_dict['location'], trigger=True)
|
||||||
painting_dict['tile_print'] = self.tile_image(print_['image'], dim_pattern, print_['scale'], dim_max, dim_max, painting_dict['location'], trigger=True)
|
painting_dict['tile_print'] = self.tile_image(print_['image'], dim_pattern, print_['scale'], dim_max, dim_max, painting_dict['location'], trigger=True)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user