diff --git a/face_analysis/annotation.py b/face_analysis/annotation.py index 60b1a10..09616b9 100644 --- a/face_analysis/annotation.py +++ b/face_analysis/annotation.py @@ -203,7 +203,7 @@ def create_annotated_image(image_bgr, measure_result, ear_mask=None, hair_mask=N # --- 自适应尺寸:字号/线宽/虚线/箭头按短边缩放 --- s = min(w, h) - font_size = max(11, round(s * 0.026)) # 字体更小 + font_size = max(12, round(s * 0.030)) # 字号上调一档 line_w = max(1, round(s * 0.0022)) dash_len = max(4, round(s * 0.008)) gap_len = max(2, round(dash_len * 0.7)) # 虚线更稠密(间隙<划线) diff --git a/face_analysis/measure.py b/face_analysis/measure.py index 5cfac61..975c5c4 100644 --- a/face_analysis/measure.py +++ b/face_analysis/measure.py @@ -12,7 +12,7 @@ from face_analysis.calibration import ( estimate_scale_factor, normalized_to_pixel, pixel_distance, _lm_list, ) from face_analysis.face_mesh_landmarks import ( - GLABELLA_9, GLABELLA_151, NOSE_BOTTOM, CHIN_TIP, + GLABELLA_9, NOSE_BOTTOM, CHIN_TIP, LEFT_EYE_OUTER, LEFT_EYE_INNER, RIGHT_EYE_INNER, RIGHT_EYE_OUTER, LEFT_CHEEK, RIGHT_CHEEK, LEFT_POSITION, RIGHT_POSITION, ) @@ -24,10 +24,8 @@ _TOP_RATIO = 0.22 / 0.28 # 顶庭 ÷ 中庭(≈ 0.786) def _brow_center(lm, w, h): - """眉心 = 索引 9 / 151 中点。""" - g9 = normalized_to_pixel(lm[GLABELLA_9], w, h) - g151 = normalized_to_pixel(lm[GLABELLA_151], w, h) - return (g9[0] + g151[0]) / 2, (g9[1] + g151[1]) / 2 + """眉心 = 索引 9(眉间上点)。""" + return normalized_to_pixel(lm[GLABELLA_9], w, h) def estimate_vertical_landmarks(landmarks, image_width, image_height):