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

Revert "feat 结果图宽度自适应"

Browse Source 
This reverts commit 4444c00949.
This commit is contained in:
zhouchengrong
2024-08-01 17:36:15 +08:00
parent 4444c00949
commit a8f76cb65e
2 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/service/design/service.py
View File

@@ -97,9 +97,9 @@ def process_object(cfg, process_id, total):
# uploaded_images.append({'image_obj': layer['pattern_image'], 'image_url': layer['pattern_image_url'], 'image_type': 'pattern_image'})
# if 'mask' in layer.keys() and layer['mask'] is not None and layer['mask_url'] is not None:
# uploaded_images.append({'image_obj': layer['mask'], 'image_url': layer['mask_url'], 'image_type': 'mask'})
layers, new_size = update_base_size_priority(layers, body_size)
# 合成
items_response['synthesis_url'] = synthesis(layers, new_size, basic_info)
items_response['synthesis_url'] = synthesis(layers, body_size, basic_info)
for lay in layers:
items_response['layers'].append({
@@ -177,19 +177,3 @@ def upload_images(image_obj):
rgba_image[rgba_image[:, :, 0] == 0] = [0, 0, 0, 0]
req = oss_upload_image(bucket=bucket_name, object_name=object_name, image_bytes=cv2.imencode('.png', rgba_image)[1])
return image_obj['image_url']
def update_base_size_priority(layers, size):
# 计算新图片的宽度和高度
max_x = max([layer["position"][1] + layer["image"].size[1] for layer in layers])
min_x = min([layer["position"][1] for layer in layers])
max_y = max([layer["position"][0] + layer["image"].size[0] for layer in layers])
min_y = min([layer["position"][0] for layer in layers])
new_width = max(size[0], max_x - min_x)
new_height = max(size[1], max_y - min_y)
# 更新图片的坐标
for layer in layers:
updated_coords = [layer["position"][1] - min_x, layer["position"][0] - min_y]
layer['position'] = updated_coords
return layers, (new_width, new_height)