aidlab/AiDA_Python
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
xupei
2024-10-30 15:04:56 +08:00
parent c508ddea48 6f940736c0
commit 0a17128140
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/service/design_fast/design_generate.py
View File

@@ -81,7 +81,7 @@ def design_generate(request_data):
'mask_url': lay['mask_url'], 'mask_url': lay['mask_url'],
'image_url': lay['image_url'] if 'image_url' in lay.keys() else None, 'image_url': lay['image_url'] if 'image_url' in lay.keys() else None,
'pattern_image_url': lay['pattern_image_url'] if 'pattern_image_url' in lay.keys() else None, 'pattern_image_url': lay['pattern_image_url'] if 'pattern_image_url' in lay.keys() else None,
'back_perspective_url': lay['back_perspective_url'] if 'back_perspective_url' in lay.keys() else None, # 'back_perspective_url': lay['back_perspective_url'] if 'back_perspective_url' in lay.keys() else None,
}) })
items_response['synthesis_url'] = synthesis(layers, new_size, basic) items_response['synthesis_url'] = synthesis(layers, new_size, basic)
else: else:

4
app/service/design_fast/item.py
View File

@@ -16,7 +16,7 @@ class TopItem(BaseItem):
LoadImage(minio_client), LoadImage(minio_client),
KeyPoint(), KeyPoint(),
Segmentation(minio_client), Segmentation(minio_client),
BackPerspective(minio_client), # BackPerspective(minio_client),
Color(minio_client), Color(minio_client),
PrintPainting(minio_client), PrintPainting(minio_client),
Scaling(), Scaling(),
@@ -37,7 +37,7 @@ class BottomItem(BaseItem):
KeyPoint(), KeyPoint(),
ContourDetection(), ContourDetection(),
# Segmentation(), # Segmentation(),
BackPerspective(minio_client), # BackPerspective(minio_client),
Color(minio_client), Color(minio_client),
PrintPainting(minio_client), PrintPainting(minio_client),
Scaling(), Scaling(),

4
app/service/design_fast/utils/organize.py
View File

@@ -34,7 +34,7 @@ def organize_clothing(layer):
gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "",
pattern_image_url=layer['pattern_image_url'], pattern_image_url=layer['pattern_image_url'],
pattern_image=layer['pattern_image'], pattern_image=layer['pattern_image'],
back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else ""
) )
# 后片数据 # 后片数据
back_layer = dict(priority=-layer.get("priority", 0) if layer.get("layer_order", False) else PRIORITY_DICT.get(f'{layer["name"].lower()}_back', None), back_layer = dict(priority=-layer.get("priority", 0) if layer.get("layer_order", False) else PRIORITY_DICT.get(f'{layer["name"].lower()}_back', None),
@@ -50,7 +50,7 @@ def organize_clothing(layer):
mask=cv2.resize(layer['mask'], layer["front_image"].size), mask=cv2.resize(layer['mask'], layer["front_image"].size),
gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "",
pattern_image_url=layer['pattern_image_url'], pattern_image_url=layer['pattern_image_url'],
back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else ""
) )
return front_layer, back_layer return front_layer, back_layer