update V1.3.8

-Add meta V1 front
-Add QR caption

generate.py

@@ -203,7 +203,7 @@ right_modhaus = Image.open("resource/right_modhaus.png")
 img_qr_white_space = Image.new("RGB", (335, 335), 'white')
 
 
-def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group_name_radio, group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt, obj_serial, obj_outline_color, obj_outline_color_picker, logo_radio, class_radio, class_txt, season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown, qr_Logo_radio, right_btn, preset):
+def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group_name_radio, group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt, obj_serial, obj_outline_color, obj_outline_color_picker, logo_radio, class_radio, class_txt, season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown, qr_Logo_radio, right_btn, preset, qr_caption):
     match obj_color:
         case 'OMA1':
             frame = outline_ui_oma
@@ -400,6 +400,11 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
     else:
         img.paste(img_qr_white_space,(555, 1098))
 
+    if qr_caption:
+        qr_caption_img = maker.draw(36, qr_caption, color=txt_color_hex)
+        img = maker.space(img, (553, 1453), (339,37), qr_caption_img)
+
+
     if right_btn:
         img_right_modhaus = edimg.color(right_modhaus, txt_color_hex)
         img.paste(img_right_modhaus, (61,1604), img_right_modhaus)

main.py

@@ -252,7 +252,9 @@ with gr.Blocks(theme=theme, js=animation, head=ga_script, analytics_enabled=True
                 with gr.Accordion('QR Options'):
                     qr_url_dropdown = gr.Dropdown(["tripleS website", "tripleS youtube", "tripleS 𝕏", "tripleS discord"], label="QR url", info="Can write any url", allow_custom_value=True, value='https://objektify.xyz')
 
-                    qr_Logo_radio = gr.Radio(["tripleS", "None"], label="QR Logo", value="None", interactive=True)
+                    with gr.Row():
+                        qr_Logo_radio = gr.Radio(["tripleS", "None"], label="QR Logo", value="None", interactive=True)
+                        qr_caption = gr.Textbox(label='caption')
 
 
                 right_btn = gr.Checkbox(label="Add Rights", value=False, interactive=True)
@@ -437,14 +439,14 @@ with gr.Blocks(theme=theme, js=animation, head=ga_script, analytics_enabled=True
                                     group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt,
                                     obj_serial, obj_outline_color, obj_outline_color_picker, logo_radio, class_radio,
                                     class_txt, season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown,
-                                    qr_Logo_radio, right_btn, preset], outputs=[outputs2, ex_img_b])
+                                    qr_Logo_radio, right_btn, preset, qr_caption], outputs=[outputs2, ex_img_b])
 
     back_tab.select(fn=generate.back,
                     inputs=[obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group_name_radio,
                             group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt, obj_serial,
                             obj_outline_color, obj_outline_color_picker, logo_radio, class_radio, class_txt,
                             season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown, qr_Logo_radio,
-                            right_btn, preset], outputs=[preview, ex_img_b])
+                            right_btn, preset, qr_caption], outputs=[preview, ex_img_b])
 
     ex_btn.click(fn=generate.ex_gen, inputs=[ex_img_f, ex_file_f, ex_img_b, ex_gen_file_count, ex_hide_blur, ex_hide_blur_range, watermark], outputs=[ex_img_f_out, ex_img_b_out])
     demo.load(fn=login_discord.id_check, outputs=[login, dev, rec, userid, beta, preset])

maker.py

@@ -1,8 +1,8 @@
-import asyncio
+
 
 from PIL import ImageFont, ImageDraw, Image
 
-async def get_text_size(text, font_path, font_size, variation = None):
+def get_text_size(text, font_path, font_size, variation = None):
     # 폰트를 로드합니다.
     font = ImageFont.truetype(font_path, font_size)
     if variation:
@@ -18,7 +18,20 @@ async def get_text_size(text, font_path, font_size, variation = None):
     return text_size
 
 
-async def draw(font_size, text, color= (211, 213, 216), font_path = "75B.otf", variation = None):
+def hex_to_rgb(hex_color):
+    # Remove the hash at the start if it's there
+    hex_color = hex_color.lstrip('#')
+
+    # Convert the string into integer values, then into a tuple
+    rgb_tuple = tuple(int(hex_color[i:i + 2], 16) for i in (0, 2, 4))
+
+    return rgb_tuple
+
+
+def draw(font_size, text, color= (211, 213, 216), font_path = "./font/Helvetica_Neue_LT_Std_75_Bold.otf", variation = None):
+    if isinstance(color, str):
+        color = hex_to_rgb(color)
+
     font = ImageFont.truetype(font_path, font_size)
     if variation:
         font.set_variation_by_name(variation)
@@ -26,7 +39,7 @@ async def draw(font_size, text, color= (211, 213, 216), font_path = "75B.otf", v
         offset_y = 10
     else:
         offset_y = 15
-    x, y = await get_text_size(text, font_path, font_size, variation)
+    x, y = 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)
@@ -51,8 +64,6 @@ def space(base_img, box_position, box_size, objekt_img):
     return base_img
 
 
-async def run():
-    (await draw(40, 'Binary01', font_path='inter.ttf', variation='Regular')).show()
 
 #asyncio.run(run())