Merge remote-tracking branch 'origin/develop' into dev-ltx
All checks were successful
git commit AiDA python develop 分支构建部署 / scheduled_deploy (push) Has been skipped
All checks were successful
git commit AiDA python develop 分支构建部署 / scheduled_deploy (push) Has been skipped
This commit is contained in:
@@ -37,7 +37,7 @@ def organize_clothing(layer):
|
||||
|
||||
pattern_image=layer['pattern_image'],
|
||||
# back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else ""
|
||||
transpose=layer.get("transpose", [0, 0]),
|
||||
transpose=layer.get("transpose", [1, 1]), # 默认为1, 1代表不镜像
|
||||
rotate=layer.get('rotate', 0),
|
||||
)
|
||||
# 后片数据
|
||||
@@ -56,7 +56,7 @@ def organize_clothing(layer):
|
||||
pattern_overall_image_url=layer['pattern_overall_image_url'],
|
||||
pattern_print_image_url=layer['pattern_print_image_url'],
|
||||
# back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else ""
|
||||
transpose=layer.get("transpose", [0, 0]),
|
||||
transpose=layer.get("transpose", [1, 1]), # 默认为1, 1代表不镜像
|
||||
rotate=layer.get('rotate', 0),
|
||||
)
|
||||
return front_layer, back_layer
|
||||
|
||||
@@ -238,22 +238,22 @@ def update_base_size_priority(layers):
|
||||
|
||||
def transpose_rotate(layer, image):
|
||||
# transpose[0]是左右 transpose[1]是上下
|
||||
transpose = layer.get('transpose', [0, 0])
|
||||
transpose = layer.get('transpose', [1, 1]) # 默认为1, 1代表不镜像
|
||||
|
||||
rotate = layer.get('rotate', 0)
|
||||
paste_x, paste_y = layer['adaptive_position'][1], layer['adaptive_position'][0]
|
||||
|
||||
# transpose左右是1 上下是-1
|
||||
if transpose[0] == 1:
|
||||
if transpose[0] != 1:
|
||||
# 左右
|
||||
image = image.transpose(0)
|
||||
|
||||
if transpose[1] == 1:
|
||||
if transpose[1] != 1:
|
||||
# 上下
|
||||
image = image.transpose(1)
|
||||
|
||||
if rotate:
|
||||
image = image.rotate(rotate, expand=True)
|
||||
image = image.rotate(-rotate, expand=True)
|
||||
# 4. 计算粘贴位置以保持视觉中心一致
|
||||
# 原本 (15, 36) 是 288*288 的左上角,我们计算其中心点
|
||||
target_center_x = 15 + 288 // 2
|
||||
|
||||
Reference in New Issue
Block a user