|
|
@@ -123,52 +123,16 @@ class DetailPicGet(DetailBase):
|
|
|
pp_bg_1 = pp_bg_1.paste_img(top_img=_pp, value=(0, 232), base="cs")
|
|
|
pp_bg_1 = pp_bg_1.paste_img(top_img=_pp_sub, value=(0, 446), base="cs")
|
|
|
goods_art_no_list = list(self.data.keys())
|
|
|
- pp_jpg_1_list = []
|
|
|
- pp_png_1_list = []
|
|
|
pp_jpg, pp_png = self.image_one_pic(
|
|
|
return_orign=True,
|
|
|
goods_art_no=goods_art_no_list[0],
|
|
|
- name="组合",
|
|
|
- )
|
|
|
- # pp_jpg_1_list.append(pp_jpg)
|
|
|
- # pp_jpg_1_list.append(pp_jpg)
|
|
|
- # pp_png_1_list.append(pp_png)
|
|
|
- # pp_png_1_list.append(pp_png)
|
|
|
- x, y = 0, 0
|
|
|
- pp_bg_jpg = PictureProcessing("RGB", (1600, 1600), (255, 255, 255))
|
|
|
- _resize_value = (
|
|
|
- pp_bg_1.width/2.5
|
|
|
+ name="俯视",
|
|
|
)
|
|
|
- pp_jpg = pp_jpg.resize(value=_resize_value + 100)
|
|
|
- pp_png = pp_png.resize(value=_resize_value + 100)
|
|
|
- # pp_bg_jpg = pp_bg_jpg.to_overlay_pic_advance(top_img=pp_jpg, value=(x, y))
|
|
|
- # for index, pp_jpg in enumerate(pp_jpg_1_list):
|
|
|
- # pp_jpg = pp_jpg.resize(value=_resize_value + 100 )
|
|
|
- # if index == 0:
|
|
|
- # x += pp_bg_1.width / 2
|
|
|
- # pp_jpg = pp_jpg.transpose()
|
|
|
- # else:
|
|
|
- # x -= pp_jpg.width - 100
|
|
|
- # pp_bg_jpg = pp_bg_jpg.to_overlay_pic_advance(top_img=pp_jpg, value=(x, y))
|
|
|
- # # y += 60
|
|
|
-
|
|
|
- # x, y = 0, 0
|
|
|
- # pp_bg_png = PictureProcessing("RGBA", (1600, 1600), (255, 255, 255, 0))
|
|
|
- # for index, pp_png in enumerate(pp_png_1_list):
|
|
|
- # pp_png = pp_png.resize(value=_resize_value + 100 )
|
|
|
- # if index == 0:
|
|
|
- # x += pp_bg_1.width / 2
|
|
|
- # pp_png = pp_png.transpose()
|
|
|
- # else:
|
|
|
- # x -= pp_jpg.width-100
|
|
|
- # pp_bg_png = pp_bg_png.paste_img(top_img=pp_png, value=(x, y))
|
|
|
- # # x -= 380
|
|
|
- # # y += 60
|
|
|
-
|
|
|
- # min_bbox = pp_bg_png.getbbox()
|
|
|
- # min_bbox = PictureProcessing().expand_bbox(min_bbox)
|
|
|
- # pp_bg_jpg = pp_bg_jpg.crop(bbox=min_bbox)
|
|
|
- # pp_bg_png = pp_bg_png.crop(bbox=min_bbox)
|
|
|
+ if not pp_jpg:
|
|
|
+ return
|
|
|
+ _resize_value = pp_bg_1.width
|
|
|
+ pp_jpg = pp_jpg.resize(value=_resize_value)
|
|
|
+ pp_png = pp_png.resize(value=_resize_value)
|
|
|
|
|
|
pp_bg_1 = pp_bg_1.to_overlay_pic_advance(
|
|
|
top_img=pp_jpg, top_png_img=pp_png, base="cc", value=(0, -100)
|
|
|
@@ -307,14 +271,14 @@ class DetailPicGet(DetailBase):
|
|
|
bg_image.paste_img(top_img=pp_text_sub_title, base="en", value=(108, 578))
|
|
|
|
|
|
goods_art_no_list = list(self.data.keys())
|
|
|
- _,pp_png = self.image_one_pic(
|
|
|
+ _, pp_png = self.image_one_pic(
|
|
|
return_orign=True,
|
|
|
goods_art_no=goods_art_no_list[0],
|
|
|
name="俯视",
|
|
|
)
|
|
|
pp_png = pp_png.resize(value=bg_image.width * 2)
|
|
|
pp_png = pp_png.transpose()
|
|
|
- bg_image.paste_img(top_img=pp_png, base="cs", value=(-pp_png.width/4, -200))
|
|
|
+ bg_image.paste_img(top_img=pp_png, base="cs", value=(-pp_png.width / 4, -200))
|
|
|
detailed_images.append(bg_image)
|
|
|
|
|
|
return PictureProcessing(im=self.add_pic(detailed_images))
|
|
|
@@ -355,6 +319,7 @@ class DetailPicGet(DetailBase):
|
|
|
detailed_images.append(bg_image)
|
|
|
|
|
|
return PictureProcessing(im=self.add_pic(detailed_images))
|
|
|
+
|
|
|
# 场景图--产品展示
|
|
|
def deal_pic_6(self):
|
|
|
detailed_images = []
|
|
|
@@ -390,6 +355,7 @@ class DetailPicGet(DetailBase):
|
|
|
detailed_images.append(bg_image)
|
|
|
|
|
|
return PictureProcessing(im=self.add_pic(detailed_images))
|
|
|
+
|
|
|
# 场景图--产品展示
|
|
|
def deal_pic_7(self):
|
|
|
detailed_images = []
|
|
|
@@ -418,7 +384,9 @@ class DetailPicGet(DetailBase):
|
|
|
|
|
|
for index, pp_jpg in enumerate(pp_jpg_1_list):
|
|
|
pp_jpg = pp_jpg.resize(value=_resize_value + 100 * index)
|
|
|
- pp_bg_jpg = pp_bg_jpg.to_overlay_pic_advance(top_img=pp_jpg, value=(x, y))
|
|
|
+ pp_bg_jpg = pp_bg_jpg.to_overlay_pic_advance(
|
|
|
+ top_img=pp_jpg, value=(x, y)
|
|
|
+ )
|
|
|
x += 180
|
|
|
y += 60
|
|
|
|
|
|
@@ -475,7 +443,9 @@ class DetailPicGet(DetailBase):
|
|
|
fill=(0, 0, 0),
|
|
|
return_mode="min_image",
|
|
|
)
|
|
|
- backImage = PictureProcessing("RGB", (top_image.width/2, 400), (255, 255, 255))
|
|
|
+ backImage = PictureProcessing(
|
|
|
+ "RGB", (top_image.width / 2, 400), (255, 255, 255)
|
|
|
+ )
|
|
|
backImage.paste_img(top_img=text_image, base="cs", value=(0, 0))
|
|
|
backImage.paste_img(top_img=pp_png_ceshi, base="cs", value=(0, 30))
|
|
|
color_pic_list_1.append(backImage)
|