update mm

demo/assets/title.md

@@ -0,0 +1,11 @@
+<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;">
+    <b>HivisionIDPhotos</b>
+  </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://github.com/Zeyi-Lin/HivisionIDPhotos/blob/master/docs/api_EN.md" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/API_Docs-API文档-315bce"></a>
+  </div>
+</div>

demo/images/resize.py

@@ -1,9 +0,0 @@
-import cv2
-
-input_image = cv2.imread("./test4.jpg")
-
-# resize成长宽的一半
-cv2.imwrite(
-    "./test4_resized_half.jpg",
-    cv2.resize(input_image, (input_image.shape[1] // 2, input_image.shape[0] // 2)),
-)

demo/locales.py

@@ -87,12 +87,17 @@ LOCALES = {
     "size_mode": {
         "en": {
             "label": "ID photo size options",
-            "choices": ["Size List", "Only Change Background", "Custom Size"],
+            "choices": [
+                "Size List",
+                "Only Change BG",
+                "Custom(px)",
+                "Custom(mm)",
+            ],
             "custom_size_eror": "The width should not be greater than the length; the length and width should not be less than 100, and no more than 1800.",
         },
         "zh": {
             "label": "证件照尺寸选项",
-            "choices": ["尺寸列表", "只换底", "自定义尺寸"],
+            "choices": ["尺寸列表", "只换底", "自定义(px)", "自定义(mm)"],
             "custom_size_eror": "宽度不应大于长度；长度和宽度不应小于100，不大于1800。",
         },
         "ja": {
@@ -100,16 +105,58 @@ LOCALES = {
             "choices": [
                 "サイズリスト",
                 "背景のみ変更",
-                "カスタムサイズ",
+                "カスタムサイズ(px)",
+                "カスタムサイズ(mm)",
             ],
             "custom_size_eror": "幅は長さより大きくしないでください。長さと幅は100以上1800以下にしてください。",
         },
         "ko": {
             "label": "증명사진 크기 옵션",
-            "choices": ["크기 목록", "배경만 변경", "사용자 지정 크기"],
+            "choices": [
+                "크기 목록",
+                "배경만 변경",
+                "사용자 지정(px)",
+                "사용자 지정(mm)",
+            ],
             "custom_size_eror": "너비는 길이보다 크지 않아야 합니다; 길이와 너비는 100 이상 1800 이하여야 합니다.",
         },
     },
+    "custom_size_px": {
+        "en": {
+            "height": "Height(px)",
+            "width": "Width(px)",
+        },
+        "zh": {
+            "height": "高度(px)",
+            "width": "宽度(px)",
+        },
+        "ja": {
+            "height": "高さ(px)",
+            "width": "幅(px)",
+        },
+        "ko": {
+            "height": "높이(px)",
+            "width": "너비(px)",
+        },
+    },
+    "custom_size_mm": {
+        "en": {
+            "height": "Height(mm)",
+            "width": "Width(mm)",
+        },
+        "zh": {
+            "height": "高度(mm)",
+            "width": "宽度(mm)",
+        },
+        "ja": {
+            "height": "高さ(mm)",
+            "width": "幅(mm)",
+        },
+        "ko": {
+            "height": "높이(mm)",
+            "width": "너비(mm)",
+        },
+    },
     "size_list": {
         "en": {
             "label": "Size list",
@@ -623,19 +670,19 @@ LOCALES = {
     "face_alignment": {
         "en": {
             "label": "Face Alignment",
-            "value": "Open",
+            "choices": ["Open"],
         },
         "zh": {
             "label": "人脸旋转对齐",
-            "value": "开启",
+            "choices": ["开启"],
         },
         "ja": {
             "label": "顔の整列",
-            "value": "開始",
+            "choices": ["開始"],
         },
         "ko": {
             "label": "얼굴 정렬",
-            "value": "시작",
+            "choices": ["시작"],
         },
     },
 }

demo/processor.py

@@ -33,6 +33,8 @@ class IDPhotoProcessor:
         custom_color_B,
         custom_size_height,
         custom_size_width,
+        custom_size_height_mm,
+        custom_size_width_mm,
         custom_image_kb,
         language,
         matting_model_option,
@@ -72,6 +74,8 @@ class IDPhotoProcessor:
             size_list_option,
             custom_size_height,
             custom_size_width,
+            custom_size_height_mm,
+            custom_size_width_mm,
         )
         if isinstance(size_result, list):
             return size_result  # 返回错误信息
@@ -159,14 +163,32 @@ class IDPhotoProcessor:
         size_list_option,
         custom_size_height,
         custom_size_width,
+        custom_size_height_mm,
+        custom_size_width_mm,
     ):
         """处理尺寸模式"""
+        # 如果选择了尺寸列表
         if idphoto_json["size_mode"] == LOCALES["size_mode"][language]["choices"][0]:
             idphoto_json["size"] = LOCALES["size_list"][language]["develop"][
                 size_list_option
             ]
-        elif idphoto_json["size_mode"] == LOCALES["size_mode"][language]["choices"][2]:
-            id_height, id_width = int(custom_size_height), int(custom_size_width)
+        # 如果选择了自定义尺寸(px或mm)
+        elif (
+            idphoto_json["size_mode"] == LOCALES["size_mode"][language]["choices"][2]
+            or idphoto_json["size_mode"] == LOCALES["size_mode"][language]["choices"][3]
+        ):
+            # 如果选择了自定义尺寸(px)
+            if (
+                idphoto_json["size_mode"]
+                == LOCALES["size_mode"][language]["choices"][2]
+            ):
+                id_height, id_width = int(custom_size_height), int(custom_size_width)
+            # 如果选择了自定义尺寸(mm)
+            else:
+                # 将mm转换为px
+                id_height = int(custom_size_height_mm / 25.4 * 300)
+                id_width = int(custom_size_width_mm / 25.4 * 300)
+            # 检查尺寸像素是否在100到1800之间
             if (
                 id_height < id_width
                 or min(id_height, id_width) < 100
@@ -174,6 +196,7 @@ class IDPhotoProcessor:
             ):
                 return self._create_error_response(language)
             idphoto_json["size"] = (id_height, id_width)
+        # 如果选择了只换底
         else:
             idphoto_json["size"] = (None, None)
 
@@ -341,7 +364,7 @@ class IDPhotoProcessor:
     ):
         """生成排版照片"""
         if idphoto_json["size_mode"] in LOCALES["size_mode"][language]["choices"][1]:
-            return gr.update(visible=False)
+            return None, gr.update(visible=False)
 
         typography_arr, typography_rotate = generate_layout_photo(
             input_height=idphoto_json["size"][0],

demo/ui.py

@@ -43,7 +43,7 @@ def create_ui(
     demo = gr.Blocks(title="HivisionIDPhotos")
 
     with demo:
-        gr.HTML(load_description(os.path.join(root_dir, "assets/title.md")))
+        gr.HTML(load_description(os.path.join(root_dir, "demo/assets/title.md")))
         with gr.Row():
             # ------------------------ 左半边 UI ------------------------
             with gr.Column():
@@ -78,26 +78,41 @@ def create_ui(
                             choices=LOCALES["size_mode"][DEFAULT_LANG]["choices"],
                             label=LOCALES["size_mode"][DEFAULT_LANG]["label"],
                             value=LOCALES["size_mode"][DEFAULT_LANG]["choices"][0],
-                            min_width=500,
+                            min_width=520,
                         )
                         face_alignment_options = gr.CheckboxGroup(
                             label=LOCALES["face_alignment"][DEFAULT_LANG]["label"],
-                            choices=[LOCALES["face_alignment"][DEFAULT_LANG]["value"]],
+                            choices=LOCALES["face_alignment"][DEFAULT_LANG]["choices"],
                             interactive=True,
                         )
                     with gr.Row(visible=True) as size_list_row:
                         size_list_options = gr.Dropdown(
                             choices=LOCALES["size_list"][DEFAULT_LANG]["choices"],
-                            label="预设尺寸",
+                            label=LOCALES["size_list"][DEFAULT_LANG]["label"],
                             value=LOCALES["size_list"][DEFAULT_LANG]["choices"][0],
                             elem_id="size_list",
                         )
-                    with gr.Row(visible=False) as custom_size:
-                        custom_size_height = gr.Number(
-                            value=413, label="height", interactive=True
+                    with gr.Row(visible=False) as custom_size_px:
+                        custom_size_height_px = gr.Number(
+                            value=413,
+                            label=LOCALES["custom_size_px"][DEFAULT_LANG]["height"],
+                            interactive=True,
+                        )
+                        custom_size_width_px = gr.Number(
+                            value=295,
+                            label=LOCALES["custom_size_px"][DEFAULT_LANG]["width"],
+                            interactive=True,
                         )
-                        custom_size_width = gr.Number(
-                            value=295, label="width", interactive=True
+                    with gr.Row(visible=False) as custom_size_mm:
+                        custom_size_height_mm = gr.Number(
+                            value=35,
+                            label=LOCALES["custom_size_mm"][DEFAULT_LANG]["height"],
+                            interactive=True,
+                        )
+                        custom_size_width_mm = gr.Number(
+                            value=25,
+                            label=LOCALES["custom_size_mm"][DEFAULT_LANG]["width"],
+                            interactive=True,
                         )
 
                     color_options = gr.Radio(
@@ -367,7 +382,7 @@ def create_ui(
                             elem_id="hd_photo_png",
                         )
 
-            # ---------------- 设置隐藏/显示组件 ----------------
+            # ---------------- 多语言切换函数 ----------------
             def change_language(language):
                 return {
                     face_detect_model_options: gr.update(
@@ -496,7 +511,19 @@ def create_ui(
                     ),
                     face_alignment_options: gr.update(
                         label=LOCALES["face_alignment"][language]["label"],
-                        value=LOCALES["face_alignment"][language]["value"],
+                        choices=LOCALES["face_alignment"][language]["choices"],
+                    ),
+                    custom_size_width_px: gr.update(
+                        label=LOCALES["custom_size_px"][language]["width"]
+                    ),
+                    custom_size_height_px: gr.update(
+                        label=LOCALES["custom_size_px"][language]["height"]
+                    ),
+                    custom_size_width_mm: gr.update(
+                        label=LOCALES["custom_size_mm"][language]["width"]
+                    ),
+                    custom_size_height_mm: gr.update(
+                        label=LOCALES["custom_size_mm"][language]["height"]
                     ),
                 }
 
@@ -512,24 +539,35 @@ def create_ui(
 
             def change_size_mode(size_option_item, lang):
                 choices = LOCALES["size_mode"][lang]["choices"]
-                # 如果选择自定义尺寸，则隐藏预设尺寸列表
-                if size_option_item == choices[2]:
+                # 如果选择自定义尺寸mm
+                if size_option_item == choices[3]:
+                    return {
+                        custom_size_px: gr.update(visible=False),
+                        custom_size_mm: gr.update(visible=True),
+                        size_list_row: gr.update(visible=False),
+                        face_alignment_options: gr.update(visible=True),
+                    }
+                # 如果选择自定义尺寸px
+                elif size_option_item == choices[2]:
                     return {
-                        custom_size: gr.update(visible=True),
+                        custom_size_px: gr.update(visible=True),
+                        custom_size_mm: gr.update(visible=False),
                         size_list_row: gr.update(visible=False),
                         face_alignment_options: gr.update(visible=True),
                     }
                 # 如果选择只换底，则隐藏所有尺寸组件
                 elif size_option_item == choices[1]:
                     return {
-                        custom_size: gr.update(visible=False),
+                        custom_size_px: gr.update(visible=False),
+                        custom_size_mm: gr.update(visible=False),
                         size_list_row: gr.update(visible=False),
                         face_alignment_options: gr.update(visible=False),
                     }
                 # 如果选择预设尺寸，则隐藏自定义尺寸组件
                 else:
                     return {
-                        custom_size: gr.update(visible=False),
+                        custom_size_px: gr.update(visible=False),
+                        custom_size_mm: gr.update(visible=False),
                         size_list_row: gr.update(visible=True),
                         face_alignment_options: gr.update(visible=True),
                     }
@@ -588,27 +626,41 @@ def create_ui(
                     sharpen_option,
                     saturation_option,
                     face_alignment_options,
+                    custom_size_width_px,
+                    custom_size_height_px,
+                    custom_size_width_mm,
+                    custom_size_height_mm,
                 ],
             )
 
+            # ---------------- 设置隐藏/显示交互效果 ----------------
+            # 尺寸模式
+            mode_options.input(
+                change_size_mode,
+                inputs=[mode_options, language_options],
+                outputs=[
+                    custom_size_px,
+                    custom_size_mm,
+                    size_list_row,
+                    face_alignment_options,
+                ],
+            )
+
+            # 颜色
             color_options.input(
                 change_color,
                 inputs=[color_options, language_options],
                 outputs=[custom_color],
             )
 
-            mode_options.input(
-                change_size_mode,
-                inputs=[mode_options, language_options],
-                outputs=[custom_size, size_list_row, face_alignment_options],
-            )
-
+            # 图片kb
             image_kb_options.input(
                 change_image_kb,
                 inputs=[image_kb_options, language_options],
                 outputs=[custom_image_kb_size],
             )
 
+            # 图片dpi
             image_dpi_options.input(
                 change_image_dpi,
                 inputs=[image_dpi_options, language_options],
@@ -627,8 +679,10 @@ def create_ui(
                     custom_color_R,
                     custom_color_G,
                     custom_color_B,
-                    custom_size_height,
-                    custom_size_width,
+                    custom_size_height_px,
+                    custom_size_width_px,
+                    custom_size_height_mm,
+                    custom_size_width_mm,
                     custom_image_kb_size,
                     language_options,
                     matting_model_options,