update

demo/assets/title.md

@@ -1,11 +1,10 @@
 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; text-align: center; font-size: 40px;">
   <div style="display: flex; align-items: center;">
     <img src="https://swanhub.co/git/repo/ZeYiLin%2FHivisionIDPhotos/file/preview?ref=master&path=assets/hivision_logo.png" alt="HivisionIDPhotos" style="width: 65px; height: 65px; margin-right: 10px;" onerror="this.style.display='none';" loading="lazy">
-    <b style="color: #6e9abb;">HivisionIDPhotos</b><span style="font-size: 18px; color: #638fb3; margin-left: 10px;"> v1.2.8</span>
+    <b style="color: #6e9abb;">HivisionIDPhotos</b><span style="font-size: 18px; color: #638fb3; margin-left: 10px;"> v1.3.1</span>
   </div>
   <div style="display: flex; justify-content: center; align-items: center; text-align: center;">
       <a href="https://github.com/xiaolin199912/HivisionIDPhotos"><img alt="Github" src="https://img.shields.io/static/v1?label=GitHub&message=GitHub&color=black" onerror="this.style.display='none';"></a> &ensp;
-      <a href="https://docs.qq.com/doc/DUkpBdk90eWZFS2JW" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/WeChat-微信-4cb55e" onerror="this.style.display='none';"></a> &ensp;
       <a href="https://github.com/xiaolin199912/HivisionIDPhotos/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/zeyi-lin/hivisionidphotos?color=ffcb47&labelColor=black&style=flat-square" onerror="this.style.display='none';"></a> &ensp;
       <a href="https://swanlab.cn?utm_source=hivision_demo"><img alt="SwanLab" src="https://img.shields.io/badge/Training%20by-SwanLab-4cb55e" onerror="this.style.display='none';"></a> &ensp;
       <a href="https://github.com/Zeyi-Lin/HivisionIDPhotos/blob/master/docs/api_CN.md" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/API_Docs-API文档-315bce" onerror="this.style.display='none';"></a>

demo/locales.py

@@ -675,12 +675,12 @@ LOCALES = {
         },
         "zh": {
             "label": "🤖插件",
-            "choices": ["人脸旋转对齐", "排版照裁剪线", "JPEG格式", "五寸相纸"],
+            "choices": ["人脸旋转对齐", "排版照裁剪线", "JPEG格式"],
             "value": ["排版照裁剪线"]
         },
         "ja": {
             "label": "🤖プラグイン",
-            "choices": ["顔の整列", "レイアウト写真の切り取り線", "JPEGフォーマット", "五寸相紙"],
+            "choices": ["顔の整列", "レイアウト写真の切り取り線", "JPEGフォーマット"],
             "value": ["レイアウト写真の切り取り線"]
         },
         "ko": {
@@ -703,4 +703,36 @@ LOCALES = {
             "label": "SNS 템플릿 사진",
         },
     },
+    "print_tab": {
+        "en": {
+            "label": "Print Layout",
+        },
+        "zh": {
+            "label": "打印排版",
+        },
+        "ja": {
+            "label": "印刷レイアウト",
+        },
+        "ko": {
+            "label": "인쇄 레이아웃",
+        },
+    },
+    "print_switch": {
+        "en": {
+            "label": "Paper size",
+            "choices": ["6 inch", "5 inch", "A4", "3R", "4R"],
+        },
+        "zh": {
+            "label": "相纸选择",
+            "choices": ["六寸", "五寸", "A4", "3R", "4R"],
+        },
+        "ja": {
+            "label": "用紙サイズ",
+            "choices": ["6インチ", "5インチ", "A4", "3R", "4R"],
+        },
+        "ko": {
+            "label": "용지 사이즈",
+            "choices": ["6인치", "5인치", "A4", "3R", "4R"],
+        },
+    },
 }

demo/processor.py

@@ -62,6 +62,7 @@ class IDPhotoProcessor:
         sharpen_strength=0,
         saturation_strength=0,
         plugin_option=[],
+        print_switch=None,
     ):        
         # 初始化参数
         top_distance_min = top_distance_max - 0.02
@@ -85,14 +86,9 @@ class IDPhotoProcessor:
             jpeg_format_option = True
         else:
             jpeg_format_option = False
-        # 五寸相纸选项
-        if LOCALES["plugin"][language]["choices"][3] in plugin_option:
-            five_inch_option = True
-        else:
-            five_inch_option = False
         
         idphoto_json = self._initialize_idphoto_json(
-            mode_option, color_option, render_option_index, image_kb_options, layout_photo_crop_line_option, jpeg_format_option, five_inch_option
+            mode_option, color_option, render_option_index, image_kb_options, layout_photo_crop_line_option, jpeg_format_option, print_switch
         )
 
         # 处理尺寸模式
@@ -177,7 +173,7 @@ class IDPhotoProcessor:
         image_kb_options,
         layout_photo_crop_line_option,
         jpeg_format_option,
-        five_inch_option,
+        print_switch,
     ):
         """初始化idphoto_json字典"""
         return {
@@ -189,7 +185,7 @@ class IDPhotoProcessor:
             "custom_image_dpi": None,
             "layout_photo_crop_line_option": layout_photo_crop_line_option,
             "jpeg_format_option": jpeg_format_option,
-            "five_inch_option": five_inch_option,
+            "print_switch": print_switch,
         }
 
     # 处理尺寸模式
@@ -320,10 +316,11 @@ class IDPhotoProcessor:
         """处理照片生成错误"""
         return [gr.update(value=None) for _ in range(4)] + [
             gr.update(visible=False),
+            gr.update(value=None),
+            gr.update(value=None),
             gr.update(
                 value=LOCALES["notification"][language]["face_error"], visible=True
             ),
-            None,
         ]
 
     # 处理生成的照片
@@ -445,11 +442,29 @@ class IDPhotoProcessor:
         if idphoto_json["size_mode"] in LOCALES["size_mode"][language]["choices"][1]:
             return None, False
 
+        # 预设排版照尺寸
+        SIX_INCH = [1205, 1795]
+        FIVE_INCH = [1051, 1500]
+        A4 = [2479, 3508]
+        THREE_R = [1051, 1500]
+        FOUR_R = [1205, 1795]
+
+        # 预设排版照尺寸字典
+        PRESET_LAYOUT_SIZE = {
+            LOCALES["print_switch"][language]["choices"][0]: SIX_INCH,
+            LOCALES["print_switch"][language]["choices"][1]: FIVE_INCH,
+            LOCALES["print_switch"][language]["choices"][2]: A4,
+            LOCALES["print_switch"][language]["choices"][3]: THREE_R,
+            LOCALES["print_switch"][language]["choices"][4]: FOUR_R,
+        }
+        
+        choose_layout_size = PRESET_LAYOUT_SIZE[idphoto_json["print_switch"]]
+        
         typography_arr, typography_rotate = generate_layout_array(
             input_height=idphoto_json["size"][0],
             input_width=idphoto_json["size"][1],
-            LAYOUT_HEIGHT= 1205 if not idphoto_json["five_inch_option"] else 1051,
-            LAYOUT_WIDTH= 1795 if not idphoto_json["five_inch_option"] else 1500,
+            LAYOUT_HEIGHT= choose_layout_size[0],
+            LAYOUT_WIDTH= choose_layout_size[1],
         )
         
         result_image_layout = generate_layout_image(
@@ -459,8 +474,8 @@ class IDPhotoProcessor:
             height=idphoto_json["size"][0],
             width=idphoto_json["size"][1],
             crop_line=idphoto_json["layout_photo_crop_line_option"],
-            LAYOUT_HEIGHT=1205 if not idphoto_json["five_inch_option"] else 1051,
-            LAYOUT_WIDTH=1795 if not idphoto_json["five_inch_option"] else 1500,
+            LAYOUT_HEIGHT=choose_layout_size[0],
+            LAYOUT_WIDTH=choose_layout_size[1],
         )
 
         return result_image_layout, True

demo/ui.py

@@ -340,6 +340,19 @@ def create_ui(
                             watermark_text_space,
                         ],
                     )
+                
+                # TAB5 - 打印 ------------------------------------------------
+                with gr.Tab(
+                    LOCALES["print_tab"][DEFAULT_LANG]["label"]
+                ) as print_parameter_tab:
+                    print_options = gr.Radio(
+                        choices=LOCALES["print_switch"][DEFAULT_LANG]["choices"],
+                        label=LOCALES["print_switch"][DEFAULT_LANG]["label"],
+                        value=LOCALES["print_switch"][DEFAULT_LANG]["choices"][0],
+                        interactive=True,
+                    )
+                    
+                
 
                 img_but = gr.Button(
                     LOCALES["button"][DEFAULT_LANG]["label"],
@@ -557,6 +570,14 @@ def create_ui(
                         choices=LOCALES["plugin"][language]["choices"],
                         value=LOCALES["plugin"][language]["choices"][0],
                     ),
+                    print_parameter_tab: gr.update(
+                        label=LOCALES["print_tab"][language]["label"]
+                    ),
+                    print_options: gr.update(
+                        label=LOCALES["print_switch"][language]["label"],
+                        choices=LOCALES["print_switch"][language]["choices"],
+                        value=LOCALES["print_switch"][language]["choices"][0],
+                    ),
                 }
 
             def change_visibility(option, lang, locales_key, custom_component):
@@ -667,6 +688,8 @@ def create_ui(
                     custom_size_height_mm,
                     img_output_template,
                     template_image_accordion,
+                    print_parameter_tab,
+                    print_options,
                 ],
             )
 
@@ -742,6 +765,7 @@ def create_ui(
                     sharpen_option,
                     saturation_option,
                     plugin_options,
+                    print_options,
                 ],
                 outputs=[
                     img_output_standard,