From f4225bcb2c78558f2a9ee6b9ff737cfe9a3ef422 Mon Sep 17 00:00:00 2001
From: zhouchengrong <Zchengrong@yeah.net>
Date: Thu, 6 Feb 2025 18:37:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=89:=20fix=EF=BC=88=E4=BF=AE=E5=A4=8Dbug=EF=BC=89:=20=20s?=
 =?UTF-8?q?ketch=E6=8B=89=E4=BC=B8=E5=AF=BC=E8=87=B4=E7=9A=84print?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20docs=EF=BC=88=E6=96=87=E6=A1=A3=E5=8F=98=E6=9B=B4=EF=BC=89:?=
 =?UTF-8?q?=20refactor=EF=BC=88=E9=87=8D=E6=9E=84=EF=BC=89:=20test(?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design_fast/pipeline/print_painting.py     | 18 ++++++++++++++++++
 app/service/design_fast/pipeline/split.py      | 18 ++++++++++++++----
 app/service/utils/new_oss_client.py            |  2 +-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/service/design_fast/pipeline/print_painting.py b/app/service/design_fast/pipeline/print_painting.py
index 6fe40d8..7120e69 100644
--- a/app/service/design_fast/pipeline/print_painting.py
+++ b/app/service/design_fast/pipeline/print_painting.py
@@ -17,6 +17,24 @@ class PrintPainting:
         element_print = result['print']['element']
         result['single_image'] = None
         result['print_image'] = None
+        # TODO 给result['pattern_image'] resize 到resize_scale的大小
+        # TODO 给result['mask'] resize 到resize_scale的大小
+
+        if result['resize_scale'][0] == 1.0 and result['resize_scale'][1] == 1.0:
+            pass
+        else:
+            height, width = result['pattern_image'].shape[:2]
+            new_width = int(width * result['resize_scale'][0])
+            new_height = int(height * result['resize_scale'][1])
+
+            result['pattern_image'] = cv2.resize(result['pattern_image'], (new_width, new_height))
+            result['mask'] = cv2.resize(result['mask'], (new_width, new_height))
+            result['gray'] = cv2.resize(result['gray'], (new_width, new_height))
+
+
+
+
+            print(1)
         if overall_print['print_path_list']:
             painting_dict = {'dim_image_h': result['pattern_image'].shape[0], 'dim_image_w': result['pattern_image'].shape[1]}
             result['print_image'] = result['pattern_image']
diff --git a/app/service/design_fast/pipeline/split.py b/app/service/design_fast/pipeline/split.py
index 344c5c5..115f814 100644
--- a/app/service/design_fast/pipeline/split.py
+++ b/app/service/design_fast/pipeline/split.py
@@ -21,11 +21,21 @@ class Split(object):
     def __call__(self, result):
         try:
 
-            if result['name'] in ('outwear', 'dress', 'blouse', 'skirt', 'trousers', 'tops', 'bottoms','accessories'):
-                front_mask = result['front_mask']
-                back_mask = result['back_mask']
+            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))
+
                 rgba_image = rgb_to_rgba(result['final_image'], front_mask + back_mask)
-                new_size = (int(rgba_image.shape[1] * result["scale"] * result["resize_scale"][0]), int(rgba_image.shape[0] * result["scale"] * result["resize_scale"][1]))
+                new_size = (int(rgba_image.shape[1] * result["scale"]), int(rgba_image.shape[0] * result["scale"]))
                 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 7939333..92b41fa 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-users/89/123-89.png"
+    url = "aida-results/result_4185cc1c-e476-11ef-b8e1-0826ae3ad6b3.png"
 
     # url = "aida-collection-element/12148/Sketchboard/95ea577b-305b-4a62-b30a-39c0dd3ddb3f.png"
     read_type = "2"