update V1.3.1L Beta

generate.py

@@ -9,6 +9,8 @@ import edimg
 import edgif
 from PIL import Image, ImageDraw, ImageFont, ImageColor, ImageFilter, ImageSequence
 
+import maker
+import pre
 
 img_blank = Image.open('resource/blank.png')
 
@@ -119,40 +121,39 @@ back_ui = Image.open("resource/back_ui.png")
 outline_ui = Image.open("resource/outline.png")
 outline_ui_oma = Image.open("resource/outline_oma.png")
 
-
 sign_positions = {
-    1: (31, 1068),
-    2: (0, 1103),
-    3: (34, 1101),
-    4: (1, 1053),
-    5: (79, 1100),
-    6: (0, 1057),
-    7: (0, 1116),
-    8: (20, 1109),
-    9: (26, 1109),
-    10: (42, 1104),
-    11: (31, 1105),
-    12: (0, 1065),
-    13: (58, 1108),
-    14: (0, 1110),
-    15: (0, 1105),
-    16: (49, 1056),
-    17: (61, 1105),
-    18: (84, 1118),
-    19: (39, 1167),
-    20: (170, 1105),
-    21: (64, 1124),
-    22: (41, 1146),
-    23: (52, 1113),
-    24: (65, 1129),
-
-    25: (38, 1148),
-    26: (61, 1100),
-    27: (52, 1113),
-    28: (46, 1022),
-    29: (62, 1131)
+    "SeoYeon": (31, 1068),
+    "HyeRin": (0, 1103),
+    "JiWoo": (34, 1101),
+    "ChaeYeon": (1, 1053),
+    "YooYeon": (79, 1100),
+    "SooMin": (0, 1057),
+    "NaKyoung": (0, 1116),
+    "YuBin": (20, 1109),
+    "Kaede": (26, 1109),
+    "DaHyun": (42, 1104),
+    "Kotone": (31, 1105),
+    "YeonJi": (0, 1065),
+    "Nien": (58, 1108),
+    "SoHyun": (0, 1110),
+    "Xinyu": (0, 1105),
+    "Mayu": (49, 1056),
+    "Lynn": (61, 1105),
+    "JooBin": (84, 1118),
+    "HaYeon": (39, 1167),
+    "ShiOn": (170, 1105),
+    "ChaeWon": (64, 1124),
+    "Sullin": (41, 1146),
+    "SeoAh": (52, 1113),
+    "JiYeon": (65, 1129),
+    "HeeJin": (38, 1148),
+    "KimLip": (61, 1100),
+    "JinSoul": (52, 1113),
+    "Choerry": (46, 1022),
+    "HaSeul": (62, 1131)
 }
 
+
 cream01 = Image.open("resource/cream01.png")
 atom01 = Image.open("resource/atom01.png")
 binary01 = Image.open("resource/binary01.png")
@@ -237,13 +238,13 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
             width, height = logo.size
 
             # Calculate the new width to maintain the aspect ratio
-            new_height = 117
+            new_height = 126
             aspect_ratio = width / height
             new_width = int(new_height * aspect_ratio)
 
             # Resize the image
             logo = logo.resize((new_width, new_height), Image.Resampling.LANCZOS)
-            img.paste(logo, (57, 151), logo)
+            img.paste(logo, (61, 162), logo)
 
 
     if member_name_dropdown:
@@ -311,13 +312,18 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
             img.paste(img_season,(53, 936), img_season)
             img.paste(img_season_outline, (53 + x, 936), img_season_outline)
 
-    if sign != None:
-        sign = sign + 1
+    if sign in pre.names:
         colored_icon = edimg.color(f'sign/{sign}.png', txt_color_hex)
-        if sign in sign_positions:
-            position = sign_positions[sign]
-            img.paste(colored_icon, position, colored_icon)
-
+        position = sign_positions[sign]
+        img.paste(colored_icon, position, colored_icon)
+    elif sign:
+        colored_icon = edimg.color(f'/data/presets/{preset}/{sign}.png', txt_color_hex)
+        original_width, original_height = colored_icon.size
+        ratio = min(480 / original_width, 330 / original_height)
+        new_width = int(original_width * ratio)
+        new_height = int(original_height * ratio)
+        colored_icon = colored_icon.resize((new_width, new_height), Image.Resampling.LANCZOS)
+        img = maker.space(img, (63, 1097), (488, 335), colored_icon)
 
     if qr_url_dropdown:
         url_txt = fn.url_mapping(qr_url_dropdown)
@@ -327,7 +333,22 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
             case "tripleS":
                 img_qr_icon = edimg.qr_icon("resource/qr_icon_triples.png")
                 img_qr.paste(img_qr_icon, (126, 126), img_qr_icon)
-
+            case 'None':
+                pass
+            case _:
+                img_qr_icon = Image.open(f'/data/presets/{preset}/qr_logo.png')
+                colored_icon = edimg.color(img_qr_icon, '#000000')
+
+                original_width, original_height = colored_icon.size
+                ratio = min(84 / original_width, 84 / original_height)
+                new_width = int(original_width * ratio)
+                new_height = int(original_height * ratio)
+                colored_icon = colored_icon.resize((new_width, new_height), Image.Resampling.LANCZOS)
+
+                qr_logo_bg = Image.new(size=(84, 84), mode='RGB', color=(255,255,255))
+                qr_logo_bg = maker.space(qr_logo_bg, (0,0), (84,84), colored_icon)
+
+                img_qr.paste(qr_logo_bg, (126, 126))
         img_qr = edimg.resize_img(img_qr, 335,335)
         img.paste(img_qr, (555, 1098))
     else:

main.py

@@ -150,7 +150,7 @@ with gr.Blocks(theme=theme) as demo: # , js=js_func
                     season_radio.change(fns.txt_season_visibility, season_radio, [season_txt, season_txt_outline])
 
 
-                sign = gr.Dropdown(choices=pre.names, label="Sign", type='index')
+                sign = gr.Dropdown(choices=pre.names, label="Sign", type='value')
 
 
                 with gr.Accordion('QR Options'):
@@ -203,25 +203,25 @@ with gr.Blocks(theme=theme) as demo: # , js=js_func
                 group_name = gr.Textbox(label="Group name", placeholder="aespa")
                 company_name = gr.Textbox(label="Company name", placeholder="SM ent")
 
-            top_logo_img = gr.Image(label="Top Logo", type='pil')
-            qr_logo_img = gr.Image(label="QR Logo", type='pil')
-
-        with gr.Accordion('Signs', open=True):
-            with gr.Row():
-                sign_img1 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img2 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img3 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img4 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-            with gr.Row():
-                sign_img5 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img6 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img7 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img8 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-            with gr.Row():
-                sign_img9 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img10 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img11 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
-                sign_img12 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+            top_logo_img = gr.Image(label="Top Logo", type='pil', image_mode='RGBA')
+            qr_logo_img = gr.Image(label="QR Logo", type='pil', image_mode='RGBA')
+
+            with gr.Accordion('Signs', open=True):
+                with gr.Row():
+                    sign_img1 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img2 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img3 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img4 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                with gr.Row():
+                    sign_img5 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img6 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img7 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img8 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                with gr.Row():
+                    sign_img9 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img10 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img11 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
+                    sign_img12 = gr.Image(label="Sign", visible=False, interactive=True, type='pil', image_mode='RGBA')
 
         save = gr.Button(value="Save and Apply all")
 

maker.py

@@ -0,0 +1,60 @@
+import asyncio
+
+from PIL import ImageFont, ImageDraw, Image
+
+async def get_text_size(text, font_path, font_size, variation = None):
+    # 폰트를 로드합니다.
+    font = ImageFont.truetype(font_path, font_size)
+    if variation:
+        font.set_variation_by_name(variation)
+    # 임시 이미지를 생성합니다.
+    dummy_image = Image.new('RGB', (1, 1))
+    draw = ImageDraw.Draw(dummy_image)
+
+    # 텍스트의 크기를 계산합니다.
+    text_bbox = draw.textbbox((0, 0), text, font=font)
+    text_size = (text_bbox[2] - text_bbox[0], text_bbox[3] - text_bbox[1])
+
+    return text_size
+
+
+async def draw(font_size, text, color= (211, 213, 216), font_path = "75B.otf", variation = None):
+    font = ImageFont.truetype(font_path, font_size)
+    if variation:
+        font.set_variation_by_name(variation)
+    if font_path == 'inter.ttf':
+        offset_y = 10
+    else:
+        offset_y = 15
+    x, y = await get_text_size(text, font_path, font_size, variation)
+    image = Image.new("RGBA", (x, y+offset_y), (0, 0, 0, 0))
+    draw = ImageDraw.Draw(image)
+    draw.text((0, 0), text, fill=color, font=font)
+    return image
+
+
+def space(base_img, box_position, box_size, objekt_img):
+
+    # 가상 상자 위치와 크기
+    x2, y2 = box_position
+    x3, y3 = box_size
+
+    # 객체 이미지 크기 가져오기
+    x4, y4 = objekt_img.size
+
+    # 중앙 위치 계산
+    xc = x2 + (x3 - x4) / 2
+    yc = y2 + (y3 - y4) / 2
+
+    # 객체 이미지를 가상 상자의 중앙에 붙이기
+    base_img.paste(objekt_img, (int(xc), int(yc)), objekt_img)
+    return base_img
+
+
+async def run():
+    (await draw(40, 'Binary01', font_path='inter.ttf', variation='Regular')).show()
+
+#asyncio.run(run())
+
+#font = ImageFont.truetype('HalvarBreit-XBd.ttf').get_variation_names()
+#print(font)

pre.py

@@ -1,5 +1,5 @@
 groups = ["tripleS", "ARTMS", "None"]
 groups_Other = ["tripleS", "ARTMS", "Other"]
 names = ["SeoYeon", "HyeRin", "JiWoo", "ChaeYeon", "YooYeon", "SooMin", "NaKyoung", "YuBin", "Kaede", "DaHyun", "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon", "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon", "HeeJin", "KimLip", "JinSoul", "Choerry", "HaSeul"]
-#login_uri = 'http://localhost:7860/'
-login_uri = 'https://chohj06ms-objektify2.hf.space/'
+login_uri = 'http://localhost:7860/'
+#login_uri = 'https://chohj06ms-objektify2.hf.space/'

preset_fn.py

@@ -56,7 +56,7 @@ def create(userid, user_name, preset_name, group, artist, company, top_logo, qr_
     if isinstance(qr_logo, str):
         cairosvg.svg2png(url=qr_logo, write_to=f"{path}/qr_logo.png")
     else:
-        qr_logo.save(f"{path}/qr_logo.png")
+        qr_logo.convert('RGBA').save(f"{path}/qr_logo.png")
 
 
     signs = [sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12]
@@ -64,9 +64,9 @@ def create(userid, user_name, preset_name, group, artist, company, top_logo, qr_
 
     for i in range(len(artist)):
         if isinstance(signs[i], str):
-            cairosvg.svg2png(url=signs[i], write_to=f"{path}/sign{i}.png")
+            cairosvg.svg2png(url=signs[i], write_to=f"{path}/{artist[i]}.png")
         else:
-            signs[i].save(f"{path}/sign{i}.png")
+            signs[i].save(f"{path}/{artist[i]}.png")
 
     data = {}
     data['userid'] = userid