diff --git a/app/service/design_fast/pipeline/split.py b/app/service/design_fast/pipeline/split.py index 88e8e75..ff73883 100644 --- a/app/service/design_fast/pipeline/split.py +++ b/app/service/design_fast/pipeline/split.py @@ -20,8 +20,9 @@ class Split(object): def __call__(self, result): try: - if result['name'] in ('outwear', 'dress', 'blouse', 'skirt', 'trousers', 'tops', 'bottoms', 'accessories'): + ori_front_mask = result['front_mask'].copy() + ori_back_mask = result['back_mask'].copy() if result['resize_scale'][0] == 1.0 and result['resize_scale'][1] == 1.0: front_mask = result['front_mask'] @@ -61,9 +62,17 @@ class Split(object): result_front_image_pil = sketch_to_transparent(result_front_image_pil, front_mask, transparent["scale"]) result['front_image'], result["front_image_url"], _ = upload_png_mask(self.minio_client, result_front_image_pil, f'{generate_uuid()}', mask=None) - height, width = front_mask.shape + # 前片部分 (红图部分) + # height, width = front_mask.shape + # mask_image = np.zeros((height, width, 3)) + # mask_image[front_mask != 0] = [0, 0, 255] + + + # 切换为原始图片尺寸------------------------------- + height, width = ori_front_mask.shape mask_image = np.zeros((height, width, 3)) - mask_image[front_mask != 0] = [0, 0, 255] + mask_image[ori_front_mask != 0] = [0, 0, 255] + # ----------------------------------------------- # if result["name"] in ('blouse', 'dress', 'outwear', 'tops'): # result_back_image = np.zeros_like(rgba_image) @@ -100,9 +109,12 @@ class Split(object): result_back_image[back_mask != 0] = rgba_image[back_mask != 0] result_back_image_pil = Image.fromarray(cvtColor(result_back_image, COLOR_BGR2RGBA)) result['back_image'], result["back_image_url"], _ = upload_png_mask(self.minio_client, result_back_image_pil, f'{generate_uuid()}', mask=None) - mask_image[back_mask != 0] = [0, 255, 0] - rbga_mask = rgb_to_rgba(mask_image, front_mask + back_mask) + # mask_image[back_mask != 0] = [0, 255, 0] + mask_image[ori_back_mask != 0] = [0, 255, 0] + + + rbga_mask = rgb_to_rgba(mask_image, ori_front_mask + ori_back_mask) mask_pil = Image.fromarray(cvtColor(rbga_mask.astype(np.uint8), COLOR_BGR2RGBA)) image_data = io.BytesIO() mask_pil.save(image_data, format='PNG') @@ -110,6 +122,7 @@ class Split(object): image_bytes = image_data.read() req = oss_upload_image(oss_client=self.minio_client, bucket=AIDA_CLOTHING, object_name=f"mask/mask_{generate_uuid()}.png", image_bytes=image_bytes) result['mask_url'] = req.bucket_name + "/" + req.object_name + # 创建中间图层 result_pattern_image_rgba = rgb_to_rgba(result['pattern_image'], result['mask']) result_pattern_image_pil = Image.fromarray(cvtColor(result_pattern_image_rgba, COLOR_BGR2RGBA))