feat(新功能):
fix(修复bug): design 用户自定义蒙版分割 docs(文档变更): refactor(重构): test(增加测试):
This commit is contained in:
@@ -57,7 +57,7 @@ class BottomItem(BaseItem):
|
|||||||
LoadImage(minio_client),
|
LoadImage(minio_client),
|
||||||
KeyPoint(),
|
KeyPoint(),
|
||||||
ContourDetection(),
|
ContourDetection(),
|
||||||
# Segmentation(),
|
Segmentation(minio_client),
|
||||||
# BackPerspective(minio_client),
|
# BackPerspective(minio_client),
|
||||||
Color(minio_client),
|
Color(minio_client),
|
||||||
PrintPainting(minio_client),
|
PrintPainting(minio_client),
|
||||||
|
|||||||
@@ -65,35 +65,51 @@ class Split(object):
|
|||||||
mask_image = np.zeros((height, width, 3))
|
mask_image = np.zeros((height, width, 3))
|
||||||
mask_image[front_mask != 0] = [0, 0, 255]
|
mask_image[front_mask != 0] = [0, 0, 255]
|
||||||
|
|
||||||
if result["name"] in ('blouse', 'dress', 'outwear', 'tops'):
|
# if result["name"] in ('blouse', 'dress', 'outwear', 'tops'):
|
||||||
result_back_image = np.zeros_like(rgba_image)
|
# result_back_image = np.zeros_like(rgba_image)
|
||||||
back_mask = cv2.resize(back_mask, new_size)
|
# back_mask = cv2.resize(back_mask, new_size)
|
||||||
result_back_image[back_mask != 0] = rgba_image[back_mask != 0]
|
# 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_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)
|
# 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]
|
# mask_image[back_mask != 0] = [0, 255, 0]
|
||||||
|
#
|
||||||
|
# rbga_mask = rgb_to_rgba(mask_image, front_mask + 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')
|
||||||
|
# image_data.seek(0)
|
||||||
|
# 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
|
||||||
|
# else:
|
||||||
|
# rbga_mask = rgb_to_rgba(mask_image, front_mask)
|
||||||
|
# mask_pil = Image.fromarray(cvtColor(rbga_mask.astype(np.uint8), COLOR_BGR2RGBA))
|
||||||
|
# image_data = io.BytesIO()
|
||||||
|
# mask_pil.save(image_data, format='PNG')
|
||||||
|
# image_data.seek(0)
|
||||||
|
# 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['back_image'] = None
|
||||||
|
# result["back_image_url"] = None
|
||||||
|
# # result["back_mask_url"] = None
|
||||||
|
# # result['back_mask_image'] = None
|
||||||
|
|
||||||
rbga_mask = rgb_to_rgba(mask_image, front_mask + back_mask)
|
result_back_image = np.zeros_like(rgba_image)
|
||||||
mask_pil = Image.fromarray(cvtColor(rbga_mask.astype(np.uint8), COLOR_BGR2RGBA))
|
back_mask = cv2.resize(back_mask, new_size)
|
||||||
image_data = io.BytesIO()
|
result_back_image[back_mask != 0] = rgba_image[back_mask != 0]
|
||||||
mask_pil.save(image_data, format='PNG')
|
result_back_image_pil = Image.fromarray(cvtColor(result_back_image, COLOR_BGR2RGBA))
|
||||||
image_data.seek(0)
|
result['back_image'], result["back_image_url"], _ = upload_png_mask(self.minio_client, result_back_image_pil, f'{generate_uuid()}', mask=None)
|
||||||
image_bytes = image_data.read()
|
mask_image[back_mask != 0] = [0, 255, 0]
|
||||||
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
|
rbga_mask = rgb_to_rgba(mask_image, front_mask + back_mask)
|
||||||
else:
|
mask_pil = Image.fromarray(cvtColor(rbga_mask.astype(np.uint8), COLOR_BGR2RGBA))
|
||||||
rbga_mask = rgb_to_rgba(mask_image, front_mask)
|
image_data = io.BytesIO()
|
||||||
mask_pil = Image.fromarray(cvtColor(rbga_mask.astype(np.uint8), COLOR_BGR2RGBA))
|
mask_pil.save(image_data, format='PNG')
|
||||||
image_data = io.BytesIO()
|
image_data.seek(0)
|
||||||
mask_pil.save(image_data, format='PNG')
|
image_bytes = image_data.read()
|
||||||
image_data.seek(0)
|
req = oss_upload_image(oss_client=self.minio_client, bucket=AIDA_CLOTHING, object_name=f"mask/mask_{generate_uuid()}.png", image_bytes=image_bytes)
|
||||||
image_bytes = image_data.read()
|
result['mask_url'] = req.bucket_name + "/" + req.object_name
|
||||||
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['back_image'] = None
|
|
||||||
result["back_image_url"] = None
|
|
||||||
# result["back_mask_url"] = None
|
|
||||||
# result['back_mask_image'] = None
|
|
||||||
# 创建中间图层
|
# 创建中间图层
|
||||||
result_pattern_image_rgba = rgb_to_rgba(result['pattern_image'], result['mask'])
|
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))
|
result_pattern_image_pil = Image.fromarray(cvtColor(result_pattern_image_rgba, COLOR_BGR2RGBA))
|
||||||
|
|||||||
Reference in New Issue
Block a user