update

demo/assets/title.md

@@ -4,10 +4,10 @@
     <b style="color: #6e9abb;">HivisionIDPhotos</b><span style="font-size: 18px; color: #638fb3; margin-left: 10px;"> v1.2.8</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"></a> &ensp;
-      <a href="https://docs.qq.com/doc/DUkpBdk90eWZFS2JW" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/WeChat-微信-4cb55e"></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"></a> &ensp;
-      <a href="https://swanlab.cn?utm_source=hivision_demo"><img alt="SwanLab" src="https://img.shields.io/badge/Training%20by-SwanLab-4cb55e"></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"></a>
+      <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>
   </div>
 </div>

demo/locales.py

@@ -546,7 +546,7 @@ LOCALES = {
             "label": "Layout photo",
         },
         "zh": {
-            "label": "六寸排版照",
+            "label": "排版照",
         },
         "ja": {
             "label": "レイアウト写真",
@@ -670,19 +670,23 @@ LOCALES = {
     "plugin": {
         "en": {
             "label": "🤖Plugin",
-            "choices": ["Face Alignment", "Layout Photo Crop Line"],
+            "choices": ["Face Alignment", "Layout Photo Crop Line", "JPEG Format", "Five Inch Paper"],
+            "value": ["Layout Photo Crop Line"]
         },
         "zh": {
             "label": "🤖插件",
-            "choices": ["人脸旋转对齐", "排版照裁剪线"],
+            "choices": ["人脸旋转对齐", "排版照裁剪线", "JPEG格式", "五寸相纸"],
+            "value": ["排版照裁剪线"]
         },
         "ja": {
             "label": "🤖プラグイン",
-            "choices": ["顔の整列", "レイアウト写真の切り取り線"],
+            "choices": ["顔の整列", "レイアウト写真の切り取り線", "JPEGフォーマット", "五寸相紙"],
+            "value": ["レイアウト写真の切り取り線"]
         },
         "ko": {
             "label": "🤖플러그인",
-            "choices": ["얼굴 정렬", "레이아웃 사진 자르기 선"],
+            "choices": ["얼굴 정렬", "레이아웃 사진 자르기 선", "JPEG 포맷", "오렌지 사진"],
+            "value": ["레이아웃 사진 자르기 선"]
         },
     },
     "template_photo": {

demo/processor.py

@@ -70,17 +70,29 @@ class IDPhotoProcessor:
             render_option
         )
         # 读取插件选项
+        # 人脸对齐选项
         if LOCALES["plugin"][language]["choices"][0] in plugin_option:
             face_alignment_option = True
         else:
             face_alignment_option = False
+        # 排版裁剪线选项
         if LOCALES["plugin"][language]["choices"][1] in plugin_option:
             layout_photo_crop_line_option = True
         else:
             layout_photo_crop_line_option = False
+        # JPEG格式选项
+        if LOCALES["plugin"][language]["choices"][2] in plugin_option:
+            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
+            mode_option, color_option, render_option_index, image_kb_options, layout_photo_crop_line_option, jpeg_format_option, five_inch_option
         )
 
         # 处理尺寸模式
@@ -164,6 +176,8 @@ class IDPhotoProcessor:
         render_option,
         image_kb_options,
         layout_photo_crop_line_option,
+        jpeg_format_option,
+        five_inch_option,
     ):
         """初始化idphoto_json字典"""
         return {
@@ -174,6 +188,8 @@ class IDPhotoProcessor:
             "custom_image_kb": None,
             "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,
         }
 
     # 处理尺寸模式
@@ -362,45 +378,27 @@ class IDPhotoProcessor:
         )
 
         # 调整图片大小
-        output_image_path_dict = self._resize_image_if_needed(
+        output_image_path_dict = self._save_image(
             result_image_standard,
             result_image_hd,
             result_image_layout,
             idphoto_json,
+            format="jpeg" if idphoto_json["jpeg_format_option"] else "png",
+        )
+        
+        # 返回
+        if result_image_layout is not None:
+            result_image_layout = output_image_path_dict["layout"]["path"]
+            
+        return self._create_response(
+            output_image_path_dict["standard"]["path"],
+            output_image_path_dict["hd"]["path"],
+            result_image_standard_png,
+            result_image_hd_png,
+            gr.update(value=result_image_layout, visible=result_image_layout_visible),
+            gr.update(value=result_image_template, visible=result_image_template_visible),
+            gr.update(visible = result_image_template_visible),
         )
-
-        # 如果output_image_path_dict为None，即没有设置KB和DPI
-        if output_image_path_dict is None:
-            return self._create_response(
-                result_image_standard,
-                result_image_hd,
-                result_image_standard_png,
-                result_image_hd_png,
-                gr.update(value=result_image_layout, visible=result_image_layout_visible),
-                gr.update(value=result_image_template, visible=result_image_template_visible),
-                gr.update(visible = result_image_template_visible),
-            )
-        # 如果output_image_path_dict不为None，即设置了KB和DPI
-        else:
-            if output_image_path_dict["layout"]["processed"]:
-                result_image_layout = output_image_path_dict["layout"]["path"]
-            return self._create_response(
-                (
-                    output_image_path_dict["standard"]["path"]
-                    if output_image_path_dict["standard"]["processed"]
-                    else result_image_standard
-                ),
-                (
-                    output_image_path_dict["hd"]["path"]
-                    if output_image_path_dict["hd"]["processed"]
-                    else result_image_hd    
-                ),
-                result_image_standard_png,
-                result_image_hd_png,
-                gr.update(value=result_image_layout, visible=result_image_layout_visible),
-                gr.update(value=result_image_template, visible=result_image_template_visible),
-                gr.update(visible = result_image_template_visible),
-            )
 
     # 渲染背景
     def _render_background(self, result_image_standard, result_image_hd, idphoto_json, language):
@@ -450,6 +448,8 @@ class IDPhotoProcessor:
         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,
         )
         
         result_image_layout = generate_layout_image(
@@ -459,6 +459,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,
         )
 
         return result_image_layout, True
@@ -512,7 +514,7 @@ class IDPhotoProcessor:
         result_image_hd = add_watermark(image=result_image_hd, **watermark_params)
         return result_image_standard, result_image_hd
 
-    def _resize_image_if_needed(
+    def _save_image(
         self,
         result_image_standard,
         result_image_hd,
@@ -520,11 +522,9 @@ class IDPhotoProcessor:
         idphoto_json,
         format="png",
     ):
-        """如果需要，调整图片大小"""
-        # 设置输出路径
-        base_path = os.path.join(
-            os.path.dirname(os.path.dirname(__file__)), "demo/kb_output"
-        )
+        # 设置输出路径（临时目录）
+        import tempfile
+        base_path = tempfile.mkdtemp()
         timestamp = int(time.time())
         output_paths = {
             "standard": {
@@ -556,53 +556,78 @@ class IDPhotoProcessor:
                 custom_kb,
                 dpi=custom_dpi,
             )
-            output_paths["standard"]["processed"] = True
             # 保存高清图像和排版图像
             save_image_dpi_to_bytes(
                 result_image_hd, output_paths["hd"]["path"], dpi=custom_dpi
             )
-            output_paths["hd"]["processed"] = True
             if result_image_layout is not None:
                 save_image_dpi_to_bytes(
                     result_image_layout, output_paths["layout"]["path"], dpi=custom_dpi
                 )
-                output_paths["layout"]["processed"] = True
 
             return output_paths
 
         # 只有自定义DPI的情况
         elif custom_dpi:
             for key in output_paths:
-                output_paths[key]["path"] += f"_{custom_dpi}dpi.{format}"
                 # 保存所有图像，使用自定义DPI
+                # 如果只换底，则不保存排版图像
                 if key == "layout" and result_image_layout is None:
-                    pass
-                else:
-                    save_image_dpi_to_bytes(
-                        locals()[f"result_image_{key}"],
-                        output_paths[key]["path"],
-                        dpi=custom_dpi,
-                    )
-                    output_paths[key]["processed"] = True
+                    continue
+                output_paths[key]["path"] += f"_{custom_dpi}dpi.{format}"
+                save_image_dpi_to_bytes(
+                    locals()[f"result_image_{key}"],
+                    output_paths[key]["path"],
+                    dpi=custom_dpi,
+                )
 
             return output_paths
 
         # 只有自定义KB的情况
         elif custom_kb:
             output_paths["standard"]["path"] += f"_{custom_kb}kb.{format}"
-            # 只调整标准图像大小并保存
+            output_paths["hd"]["path"] += f".{format}"
+            if not (key == "layout" and result_image_layout is None):
+                output_paths[key]["path"] += f".{format}"
+            
+            # 只调整标准图像大小
             resize_image_to_kb(
                 result_image_standard,
                 output_paths["standard"]["path"],
                 custom_kb,
                 dpi=300,
             )
-            output_paths["standard"]["processed"] = True
+            
+            # 保存高清图像和排版图像
+            save_image_dpi_to_bytes(
+                result_image_hd, output_paths["hd"]["path"], dpi=300
+            )
+            if result_image_layout is not None:
+                save_image_dpi_to_bytes(
+                    result_image_layout, output_paths["layout"]["path"], dpi=300
+                )
 
             return output_paths
-
-        # 如果没有自定义设置，返回None
-        return None
+        # 没有自定义设置
+        else: 
+            output_paths["standard"]["path"] += f".{format}"
+            output_paths["hd"]["path"] += f".{format}"
+            output_paths["layout"]["path"] += f".{format}"
+            
+            # 保存所有图像
+            save_image_dpi_to_bytes(
+                result_image_standard, output_paths["standard"]["path"], dpi=300
+            )
+            save_image_dpi_to_bytes(
+                result_image_hd, output_paths["hd"]["path"], dpi=300
+            )
+            if result_image_layout is not None:
+                save_image_dpi_to_bytes(
+                    result_image_layout, output_paths["layout"]["path"], dpi=300
+                )
+                
+            return output_paths
+            
 
     def _create_response(
         self,
@@ -613,7 +638,7 @@ class IDPhotoProcessor:
         result_layout_image_gr,
         result_image_template_gr,
         result_image_template_accordion_gr,
-    ):
+    ):    
         """创建响应"""
         response = [
             result_image_standard,

demo/ui.py

@@ -148,6 +148,7 @@ def create_ui(
                             label=LOCALES["plugin"][DEFAULT_LANG]["label"],
                             choices=LOCALES["plugin"][DEFAULT_LANG]["choices"],
                             interactive=True,
+                            value=LOCALES["plugin"][DEFAULT_LANG]["value"]
                         )
 
                 # TAB2 - 高级参数 ------------------------------------------------

hivision/creator/layout_calculator.py

@@ -75,10 +75,8 @@ def judge_layout(
         return layout_mode, centerBlockWidth_1, centerBlockHeight_1
 
 
-def generate_layout_array(input_height, input_width):
+def generate_layout_array(input_height, input_width, LAYOUT_WIDTH=1795, LAYOUT_HEIGHT=1205):
     # 1.基础参数表
-    LAYOUT_WIDTH = 1746
-    LAYOUT_HEIGHT = 1180
     PHOTO_INTERVAL_H = 30  # 证件照与证件照之间的垂直距离
     PHOTO_INTERVAL_W = 30  # 证件照与证件照之间的水平距离
     SIDES_INTERVAL_H = 50  # 证件照与画布边缘的垂直距离
@@ -118,12 +116,12 @@ def generate_layout_array(input_height, input_width):
 
 
 def generate_layout_image(
-    input_image, typography_arr, typography_rotate, width=295, height=413, crop_line:bool=False,
+    input_image, typography_arr, typography_rotate, width=295, height=413, 
+    crop_line:bool=False,
+    LAYOUT_WIDTH=1795, 
+    LAYOUT_HEIGHT=1205,
 ):
-    # 定义画布的宽度和高度
-    LAYOUT_WIDTH = 1746
-    LAYOUT_HEIGHT = 1180
-    
+  
     # 创建一个白色背景的空白画布
     white_background = np.zeros([LAYOUT_HEIGHT, LAYOUT_WIDTH, 3], np.uint8)
     white_background.fill(255)