From 95e3daa469b7c169fba4ea76a1887dbf3de8c05e Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Fri, 7 Feb 2025 16:01:09 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat=EF=BC=88=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=89:=20fix=EF=BC=88=E4=BF=AE=E5=A4=8Dbug?= =?UTF-8?q?=EF=BC=89:=20=20print=20=E4=BA=8E=20sketch=E6=8B=89=E4=BC=B8?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84print=E6=AF=94=E4=BE=8B=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98=20docs=EF=BC=88=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=8F=98=E6=9B=B4=EF=BC=89:=20refactor=EF=BC=88?= =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=89:=20test(=E5=A2=9E=E5=8A=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95):"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bba91b46 --- app/service/design_fast/pipeline/split.py | 18 ++++-------------- app/service/utils/new_oss_client.py | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/service/design_fast/pipeline/split.py b/app/service/design_fast/pipeline/split.py index 115f814..344c5c5 100644 --- a/app/service/design_fast/pipeline/split.py +++ b/app/service/design_fast/pipeline/split.py @@ -21,21 +21,11 @@ class Split(object): def __call__(self, result): try: - if result['name'] in ('outwear', 'dress', 'blouse', 'skirt', 'trousers', 'tops', 'bottoms', 'accessories'): - - if result['resize_scale'][0] == 1.0 and result['resize_scale'][1] == 1.0: - front_mask = result['front_mask'] - back_mask = result['back_mask'] - else: - height, width = result['front_mask'].shape[:2] - new_width = int(width * result['resize_scale'][0]) - new_height = int(height * result['resize_scale'][1]) - - front_mask = cv2.resize(result['front_mask'], (new_width, new_height)) - back_mask = cv2.resize(result['back_mask'], (new_width, new_height)) - + if result['name'] in ('outwear', 'dress', 'blouse', 'skirt', 'trousers', 'tops', 'bottoms','accessories'): + front_mask = result['front_mask'] + back_mask = result['back_mask'] rgba_image = rgb_to_rgba(result['final_image'], front_mask + back_mask) - new_size = (int(rgba_image.shape[1] * result["scale"]), int(rgba_image.shape[0] * result["scale"])) + new_size = (int(rgba_image.shape[1] * result["scale"] * result["resize_scale"][0]), int(rgba_image.shape[0] * result["scale"] * result["resize_scale"][1])) rgba_image = cv2.resize(rgba_image, new_size) result_front_image = np.zeros_like(rgba_image) front_mask = cv2.resize(front_mask, new_size) diff --git a/app/service/utils/new_oss_client.py b/app/service/utils/new_oss_client.py index 92b41fa..7939333 100644 --- a/app/service/utils/new_oss_client.py +++ b/app/service/utils/new_oss_client.py @@ -82,7 +82,7 @@ if __name__ == '__main__': # url = "aida-users/89/sketchboard/female/Dress/e6724ab7-8d3f-4677-abe0-c3e42ab7af85.jpeg" # url = "aida-users/87/print/956614a2-7e75-4fbe-9ed0-c1831e37a2c9-4-87.png" # url = "aida-users/89/single_logo/123-89.png" - url = "aida-results/result_4185cc1c-e476-11ef-b8e1-0826ae3ad6b3.png" + url = "aida-users/89/123-89.png" # url = "aida-collection-element/12148/Sketchboard/95ea577b-305b-4a62-b30a-39c0dd3ddb3f.png" read_type = "2"