Rework layout engine around exact-glyph collision, add tests and docs sync
Replace the old bbox/heuristic placement (scale search rounds, large-font capping, stratified sampling, fill-retry ladders) with an area-model font sizing pass feeding a C++ exact-glyph collision engine (centroid-biased spiral + random probing, HD clearance refinement, density/hole optimization). Simplify the frontend advanced-params panel and JobParams type to match the surviving config surface, add a layout-constraints test suite and a repeatable benchmark tool, and bring docs/*.md back in sync with current code (plus new TESTING.md and DEPLOYMENT.md). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Claude Sonnet 5
+463
-213
@@ -1,4 +1,5 @@
|
||||
import logging
|
||||
import math
|
||||
import os
|
||||
import sqlite3
|
||||
import sys
|
||||
@@ -13,13 +14,32 @@ from . import config
|
||||
from .fonts import get_cached_font
|
||||
from .layout import OptimizedEfficientWordCloud
|
||||
from .mask import analyze_mask, apply_safe_padding, calculate_dynamic_dimensions, prepare_mask
|
||||
from .render import apply_dot_matrix, compute_fill_ratio_fast
|
||||
from .weights import calculate_font_by_area_model, extract_weights_from_df, get_stroke_complexity_batch
|
||||
from .render import (
|
||||
compute_fill_ratio_fast,
|
||||
count_layout_overlap_pixels,
|
||||
largest_empty_square_size,
|
||||
refine_layout_with_hd_clearance,
|
||||
scale_layout_for_hd,
|
||||
)
|
||||
from .weights import (
|
||||
calculate_font_by_area_model,
|
||||
extract_weights_from_df,
|
||||
get_stroke_complexity_batch,
|
||||
merge_weight_maps,
|
||||
)
|
||||
|
||||
log = logging.getLogger("core.pipeline")
|
||||
|
||||
|
||||
def run_generation_pass(names, frequencies_data, name_weights_map, mask_hd, real_hd_w, real_hd_h):
|
||||
def run_generation_pass(
|
||||
names,
|
||||
frequencies_data,
|
||||
name_weights_map,
|
||||
mask_hd,
|
||||
real_hd_w,
|
||||
real_hd_h,
|
||||
_collision_margin=0,
|
||||
):
|
||||
log.info("[run_generation_pass] 开始")
|
||||
log.info(" 输入: %d 词 | HD尺寸: %dx%d", len(names), real_hd_w, real_hd_h)
|
||||
|
||||
@@ -42,44 +62,73 @@ def run_generation_pass(names, frequencies_data, name_weights_map, mask_hd, real
|
||||
|
||||
print(f"最终输出: {real_hd_w}x{real_hd_h} | 运算网格: {w_small}x{h_small}")
|
||||
|
||||
current_min_font = max(config.MIN_FONT_FLOOR, int(config.MIN_READABLE_HEIGHT_PX * config.WORK_SCALE))
|
||||
readable_min_font = max(
|
||||
config.MIN_FONT_FLOOR,
|
||||
int(math.ceil(config.MIN_READABLE_HEIGHT_PX * config.WORK_SCALE)),
|
||||
)
|
||||
total_target = len(names) * config.N_REPETITIONS
|
||||
current_packing_eff = config.PACKING_EFFICIENCY
|
||||
grow_step = config.GROW_FONT_STEP if config.GROW_FONT_ON_LOW_FILL else 1.0
|
||||
final_wc = None
|
||||
final_scale = 1.0
|
||||
base_min_font = current_min_font
|
||||
base_max_font = current_min_font + 1
|
||||
base_layout_seed = config.LAYOUT_SEED if config.LAYOUT_SEED is not None else config.SEED
|
||||
final_layout_seed = base_layout_seed
|
||||
base_min_font, base_max_font = calculate_font_by_area_model(
|
||||
mask_small,
|
||||
names,
|
||||
name_weights_map,
|
||||
config.TARGET_FILL_RATIO,
|
||||
config.SIZE_RATIO,
|
||||
config.PACKING_EFFICIENCY,
|
||||
config.N_REPETITIONS,
|
||||
)
|
||||
|
||||
def compute_font_bounds(packing_eff):
|
||||
min_font, max_font = calculate_font_by_area_model(
|
||||
mask_small, names, name_weights_map, config.TARGET_FILL_RATIO, config.SIZE_RATIO, packing_eff, config.N_REPETITIONS
|
||||
)
|
||||
min_font = max(current_min_font, min_font)
|
||||
explicit_min_font = config.USER_MIN_FONT_SIZE is not None
|
||||
hard_min_font = readable_min_font
|
||||
if explicit_min_font:
|
||||
hard_min_font = max(config.MIN_FONT_FLOOR, int(round(config.USER_MIN_FONT_SIZE)))
|
||||
|
||||
if config.USER_MIN_FONT_SIZE is not None:
|
||||
user_min = int(config.USER_MIN_FONT_SIZE)
|
||||
if user_min < config.MIN_FONT_FLOOR:
|
||||
config._warn(f"USER_MIN_FONT_SIZE={config.USER_MIN_FONT_SIZE} 过小，提升到 {config.MIN_FONT_FLOOR}")
|
||||
user_min = config.MIN_FONT_FLOOR
|
||||
min_font = user_min
|
||||
hard_max_font = None
|
||||
if config.USER_MAX_FONT_SIZE is not None:
|
||||
hard_max_font = max(config.MIN_FONT_FLOOR, int(round(config.USER_MAX_FONT_SIZE)))
|
||||
if explicit_min_font and hard_max_font < hard_min_font:
|
||||
raise ValueError(
|
||||
f"字号硬约束冲突: USER_MAX_FONT_SIZE={hard_max_font} "
|
||||
f"小于最小允许字号 {hard_min_font}"
|
||||
)
|
||||
if not explicit_min_font:
|
||||
# A user-specified maximum outranks the automatic readability
|
||||
# suggestion. It remains an exact ceiling rather than causing an
|
||||
# artificial conflict with a value the user never requested.
|
||||
hard_min_font = min(hard_min_font, hard_max_font)
|
||||
|
||||
if config.USER_MAX_FONT_SIZE is not None:
|
||||
user_max = int(config.USER_MAX_FONT_SIZE)
|
||||
if user_max < config.MIN_FONT_FLOOR:
|
||||
config._warn(f"USER_MAX_FONT_SIZE={config.USER_MAX_FONT_SIZE} 过小，提升到 {config.MIN_FONT_FLOOR}")
|
||||
user_max = config.MIN_FONT_FLOOR
|
||||
max_font = user_max
|
||||
equal_size_mode = math.isclose(float(config.SIZE_RATIO), 1.0, rel_tol=0.0, abs_tol=1e-9)
|
||||
base_min_font = max(hard_min_font, int(base_min_font))
|
||||
base_max_font = max(base_min_font, int(base_max_font))
|
||||
if hard_max_font is not None:
|
||||
base_min_font = min(base_min_font, hard_max_font)
|
||||
base_max_font = min(base_max_font, hard_max_font)
|
||||
if equal_size_mode:
|
||||
# Keep one scalar throughout every retry. This is what makes
|
||||
# SIZE_RATIO=1 exact even after automatic batch scaling.
|
||||
equal_font = min(base_min_font, base_max_font)
|
||||
base_min_font = equal_font
|
||||
base_max_font = equal_font
|
||||
|
||||
if max_font <= min_font:
|
||||
config._warn(f"字号区间无效: min={min_font}, max={max_font}，自动修正 max=min+1")
|
||||
max_font = min_font + 1
|
||||
def scaled_bounds(scale):
|
||||
if equal_size_mode:
|
||||
size = max(hard_min_font, int(round(base_min_font * scale)))
|
||||
if hard_max_font is not None:
|
||||
size = min(size, hard_max_font)
|
||||
return size, size
|
||||
|
||||
return min_font, max_font
|
||||
min_font = max(hard_min_font, int(round(base_min_font * scale)))
|
||||
max_font = max(min_font, int(round(base_max_font * scale)))
|
||||
if hard_max_font is not None:
|
||||
min_font = min(min_font, hard_max_font)
|
||||
max_font = min(max_font, hard_max_font)
|
||||
return min_font, max(min_font, max_font)
|
||||
|
||||
def try_place(min_font, max_font, large_ratio=config.LARGE_FONT_LIMIT_RATIO, size_scale=1.0):
|
||||
min_font = max(config.MIN_FONT_FLOOR, int(min_font))
|
||||
max_font = max(min_font + 1, int(max_font))
|
||||
def try_place(scale, layout_seed=base_layout_seed):
|
||||
min_font, max_font = scaled_bounds(scale)
|
||||
wc = OptimizedEfficientWordCloud(
|
||||
width=w_small,
|
||||
height=h_small,
|
||||
@@ -89,108 +138,77 @@ def run_generation_pass(names, frequencies_data, name_weights_map, mask_hd, real
|
||||
min_font_size=min_font,
|
||||
max_font_size=max_font,
|
||||
background_color=config.get_output_background(),
|
||||
use_spiral_search=True,
|
||||
large_font_ratio=large_ratio,
|
||||
size_scale=size_scale,
|
||||
prefer_horizontal=0.82,
|
||||
# HD clearance is applied after scaling. Keeping the coarse-grid
|
||||
# margin at zero avoids turning 1 HD pixel into 5-6 output pixels.
|
||||
margin=_collision_margin,
|
||||
)
|
||||
if config.ENABLE_STRATIFIED_SAMPLING:
|
||||
wc.grid.reorder_stratified(config.STRATIFIED_BANDS)
|
||||
wc.layout_seed = layout_seed
|
||||
wc.generate_from_frequencies(frequencies_data)
|
||||
return wc, len(wc.layout_)
|
||||
return wc, len(wc.layout_), min_font, max_font
|
||||
|
||||
print(f"--- 5. 启动生成 (目标: {total_target} 词) ---")
|
||||
log.info("--- 5. 启动生成 ---")
|
||||
log.info(" 目标词数: %d (names=%d * N_REPETITIONS=%d)", total_target, len(names), config.N_REPETITIONS)
|
||||
log.info(" 当前最小字号: %d, 效率: %.2f", current_min_font, current_packing_eff)
|
||||
for attempt in range(1, config.MAX_ATTEMPTS + 1):
|
||||
base_min_font, base_max_font = compute_font_bounds(current_packing_eff)
|
||||
print(f"尝试 #{attempt}: 基准字号 [{base_min_font}, {base_max_font}], 效率: {current_packing_eff:.2f}")
|
||||
log.info("[尝试 #%d] 字号区间: [%d, %d], 效率: %.2f, 大字率: %.2f",
|
||||
attempt, base_min_font, base_max_font, current_packing_eff, config.LARGE_FONT_LIMIT_RATIO)
|
||||
log.info(
|
||||
" 基准字号: [%d, %d], 硬边界: [%d, %s], 等字号=%s",
|
||||
base_min_font,
|
||||
base_max_font,
|
||||
hard_min_font,
|
||||
hard_max_font if hard_max_font is not None else "∞",
|
||||
equal_size_mode,
|
||||
)
|
||||
|
||||
best_wc = None
|
||||
best_count = 0
|
||||
best_scale = config.FONT_SCALE_MIN
|
||||
best_success_wc = None
|
||||
best_success_scale = None
|
||||
current_large_ratio = config.LARGE_FONT_LIMIT_RATIO
|
||||
low_scale = max(config.SCALE_FLOOR, config.FONT_SCALE_MIN)
|
||||
high_scale = max(low_scale + 0.01, config.FONT_SCALE_MAX)
|
||||
|
||||
for _ in range(max(1, config.SCALE_SEARCH_ROUNDS)):
|
||||
mid_scale = ((low_scale + high_scale) / 2) * grow_step
|
||||
wc, placed_count = try_place(base_min_font, base_max_font, current_large_ratio, mid_scale)
|
||||
print(f" 尺度 {mid_scale:.3f} (字号 {base_min_font}-{base_max_font}) -> 成功: {placed_count}/{total_target}")
|
||||
log.info(" 尺度 %.3f -> 放置 %d/%d", mid_scale, placed_count, total_target)
|
||||
|
||||
if placed_count > best_count:
|
||||
best_wc = wc
|
||||
best_count = placed_count
|
||||
best_scale = mid_scale
|
||||
|
||||
if config.REQUIRE_ALL_WORDS:
|
||||
if placed_count >= total_target:
|
||||
best_success_wc = wc
|
||||
best_success_scale = mid_scale
|
||||
low_scale = max(low_scale, mid_scale / max(grow_step, 1e-6))
|
||||
else:
|
||||
high_scale = min(high_scale, mid_scale / max(grow_step, 1e-6))
|
||||
else:
|
||||
if placed_count >= best_count:
|
||||
low_scale = max(low_scale, mid_scale / max(grow_step, 1e-6))
|
||||
else:
|
||||
high_scale = min(high_scale, mid_scale / max(grow_step, 1e-6))
|
||||
|
||||
if abs(high_scale - low_scale) < 0.02:
|
||||
break
|
||||
|
||||
if best_success_wc is not None:
|
||||
final_wc = best_success_wc
|
||||
final_scale = best_success_scale if best_success_scale is not None else best_scale
|
||||
# Every attempt is a fresh, whole-cloud layout. No word may silently
|
||||
# receive a smaller fallback size. Usually the area model succeeds on
|
||||
# attempt one; two adaptive retries cover fragmentation-heavy masks.
|
||||
best_wc = None
|
||||
best_count = 0
|
||||
best_scale = 1.0
|
||||
scale = 1.0
|
||||
tried_layouts = set()
|
||||
failed_scales = []
|
||||
for attempt in range(1, 4):
|
||||
bounds = scaled_bounds(scale)
|
||||
layout_key = (bounds, base_layout_seed)
|
||||
if layout_key in tried_layouts:
|
||||
break
|
||||
tried_layouts.add(layout_key)
|
||||
wc, placed_count, min_font, max_font = try_place(scale)
|
||||
print(
|
||||
f" 整批布局 #{attempt}: scale={scale:.3f}, "
|
||||
f"字号=[{min_font}, {max_font}] -> {placed_count}/{total_target}"
|
||||
)
|
||||
log.info(
|
||||
" 整批布局 #%d scale=%.3f 字号=[%d,%d] -> %d/%d",
|
||||
attempt,
|
||||
scale,
|
||||
min_font,
|
||||
max_font,
|
||||
placed_count,
|
||||
total_target,
|
||||
)
|
||||
if placed_count > best_count:
|
||||
best_wc = wc
|
||||
best_count = placed_count
|
||||
best_scale = scale
|
||||
if placed_count >= total_target:
|
||||
final_wc = wc
|
||||
final_scale = scale
|
||||
final_layout_seed = base_layout_seed
|
||||
break
|
||||
|
||||
if best_wc is not None:
|
||||
shrink_min = current_min_font
|
||||
for _ in range(config.AUTO_SHRINK_ROUNDS):
|
||||
shrink_min = max(config.MIN_FONT_FLOOR, int(shrink_min * 0.8))
|
||||
if shrink_min >= base_min_font:
|
||||
continue
|
||||
failed_scales.append(scale)
|
||||
|
||||
print(f" [降级:缩小字号] {shrink_min}...")
|
||||
wc, placed_count = try_place(shrink_min, base_max_font, current_large_ratio, best_scale)
|
||||
if placed_count > best_count:
|
||||
best_wc = wc
|
||||
best_count = placed_count
|
||||
best_scale = best_scale
|
||||
if config.REQUIRE_ALL_WORDS and placed_count >= total_target:
|
||||
final_wc = wc
|
||||
final_scale = best_scale
|
||||
break
|
||||
if final_wc is not None:
|
||||
break
|
||||
placed_ratio = placed_count / max(1, total_target)
|
||||
# Required box area is roughly proportional to size². The extra
|
||||
# safety margin absorbs fragmentation without wasting a binary search.
|
||||
shrink = 0.62 if placed_ratio <= 0 else min(0.92, max(0.58, math.sqrt(placed_ratio) * 0.92))
|
||||
scale *= shrink
|
||||
|
||||
if config.ENABLE_SMART_LARGE_FONT_REDUCTION:
|
||||
print(" [降级:牺牲大字] 仍然放不下，尝试减少大字数量...")
|
||||
strict_large_ratio = 0.05
|
||||
retry_min = shrink_min if 'shrink_min' in locals() else current_min_font
|
||||
wc, placed_count = try_place(retry_min, base_max_font, strict_large_ratio, best_scale)
|
||||
print(f" [严格模式] 大字率 {strict_large_ratio} -> 成功: {placed_count}/{total_target}")
|
||||
|
||||
if placed_count > best_count:
|
||||
best_wc = wc
|
||||
best_count = placed_count
|
||||
if config.REQUIRE_ALL_WORDS and placed_count >= total_target:
|
||||
final_wc = wc
|
||||
final_scale = best_scale
|
||||
break
|
||||
|
||||
if attempt == config.MAX_ATTEMPTS:
|
||||
final_wc = best_wc
|
||||
final_scale = best_scale
|
||||
break
|
||||
|
||||
shrink_ratio = (best_count / total_target) if best_count else 0.5
|
||||
current_packing_eff *= min(0.95, max(0.5, shrink_ratio))
|
||||
if final_wc is None:
|
||||
final_wc = best_wc
|
||||
final_scale = best_scale
|
||||
|
||||
if final_wc is None:
|
||||
return {
|
||||
@@ -203,61 +221,263 @@ def run_generation_pass(names, frequencies_data, name_weights_map, mask_hd, real
|
||||
"base_max_font": base_max_font,
|
||||
"mask_small": mask_small,
|
||||
"size_scale": final_scale,
|
||||
"layout_seed": final_layout_seed,
|
||||
"collision_margin": _collision_margin,
|
||||
"hd_overlap_pixels": 0,
|
||||
"hd_layout": [],
|
||||
"hd_clearance": None,
|
||||
}
|
||||
|
||||
fill_ratio, occ_fast = compute_fill_ratio_fast(final_wc.layout_, mask_small, config.WC_FONT_PATH)
|
||||
largest_empty_square = largest_empty_square_size(occ_fast, mask_small)
|
||||
|
||||
def has_character_sized_hole(wc, hole_size):
|
||||
if not equal_size_mode or wc is None or not wc.layout_:
|
||||
return False
|
||||
font_size = int(wc.layout_[0][1])
|
||||
return hole_size >= max(2, int(math.ceil(font_size * 1.25)))
|
||||
|
||||
complete_candidates = []
|
||||
if len(final_wc.layout_) >= total_target:
|
||||
complete_candidates.append(
|
||||
(final_wc, final_scale, final_layout_seed, fill_ratio, occ_fast)
|
||||
)
|
||||
print(f"填充率: {fill_ratio:.3f}")
|
||||
log.info("[填充率] 初始填充率: %.4f (最低要求: %.4f)", fill_ratio, config.MIN_ACCEPT_FILL_RATIO)
|
||||
log.info("[填充率] 初始填充率: %.4f", fill_ratio)
|
||||
log.info(" layout_ 词数: %d", len(final_wc.layout_))
|
||||
if config.SAVE_DEBUG_IMAGES and occ_fast is not None:
|
||||
debug_dir = Path(config.DEBUG_OUTPUT_DIR)
|
||||
debug_dir.mkdir(parents=True, exist_ok=True)
|
||||
Image.fromarray((occ_fast * 255).astype(np.uint8)).save(str(debug_dir / "occ_fast.png"))
|
||||
|
||||
if fill_ratio < config.MIN_ACCEPT_FILL_RATIO:
|
||||
print(f"[填充率不足] {fill_ratio:.3f} < {config.MIN_ACCEPT_FILL_RATIO:.2f}，启动二分放大字号重试...")
|
||||
low_scale = max(final_scale, 1.0)
|
||||
high_scale = max(low_scale, config.FILL_RETRY_MAX_SCALE)
|
||||
retry_round = 0
|
||||
best_wc = final_wc
|
||||
best_fill = fill_ratio
|
||||
# Probe larger whole-cloud layouts and keep the largest complete one. If
|
||||
# an earlier batch was too large, search the discrete interval between the
|
||||
# complete and failed scales instead of accepting an over-aggressive
|
||||
# shrink. Every probe rebuilds the entire cloud with one shared scale.
|
||||
if (
|
||||
len(final_wc.layout_) >= total_target
|
||||
and fill_ratio > 0
|
||||
and (
|
||||
fill_ratio < config.TARGET_FILL_RATIO * 0.98
|
||||
or has_character_sized_hole(final_wc, largest_empty_square)
|
||||
)
|
||||
):
|
||||
upper_scale = min(
|
||||
(failed for failed in failed_scales if failed > final_scale),
|
||||
default=None,
|
||||
)
|
||||
for density_attempt in range(1, 5):
|
||||
if upper_scale is not None:
|
||||
grow_scale = (final_scale + upper_scale) / 2.0
|
||||
elif equal_size_mode:
|
||||
current_size, _ = scaled_bounds(final_scale)
|
||||
grow_scale = (current_size + 1) / max(1, base_min_font)
|
||||
else:
|
||||
desired_growth = min(
|
||||
1.12,
|
||||
math.sqrt(config.TARGET_FILL_RATIO / fill_ratio) * 0.98,
|
||||
)
|
||||
if desired_growth <= 1.005:
|
||||
break
|
||||
grow_scale = final_scale * desired_growth
|
||||
|
||||
while retry_round < config.FILL_RETRY_MAX_ROUNDS:
|
||||
mid_scale = (low_scale + high_scale) / 2
|
||||
retry_large_ratio = 1.0 if config.FILL_RETRY_RELAX_LARGE_CAP else config.LARGE_FONT_LIMIT_RATIO
|
||||
grow_bounds = scaled_bounds(grow_scale)
|
||||
if grow_bounds == scaled_bounds(final_scale):
|
||||
break
|
||||
grow_min, grow_max = grow_bounds
|
||||
layout_key = (grow_bounds, base_layout_seed)
|
||||
attempted_layout = False
|
||||
if layout_key not in tried_layouts:
|
||||
tried_layouts.add(layout_key)
|
||||
wc, placed_count, _, _ = try_place(grow_scale)
|
||||
attempted_layout = True
|
||||
print(
|
||||
f" 密度优化 #{density_attempt}: scale={grow_scale:.3f}, "
|
||||
f"字号=[{grow_min}, {grow_max}] -> {placed_count}/{total_target}"
|
||||
)
|
||||
else:
|
||||
wc, placed_count = None, -1
|
||||
|
||||
wc, _placed_count = try_place(base_min_font, base_max_font, retry_large_ratio, mid_scale)
|
||||
new_fill, occ_fast = compute_fill_ratio_fast(wc.layout_, mask_small, config.WC_FONT_PATH)
|
||||
print(f" [二分重试#{retry_round + 1}] scale={mid_scale:.3f} 填充率={new_fill:.3f}")
|
||||
|
||||
if new_fill > best_fill:
|
||||
best_fill = new_fill
|
||||
best_wc = wc
|
||||
|
||||
if new_fill >= config.MIN_ACCEPT_FILL_RATIO:
|
||||
final_wc = wc
|
||||
final_scale = mid_scale
|
||||
fill_ratio = new_fill
|
||||
if config.SAVE_DEBUG_IMAGES and occ_fast is not None:
|
||||
debug_dir = Path(config.DEBUG_OUTPUT_DIR)
|
||||
debug_dir.mkdir(parents=True, exist_ok=True)
|
||||
Image.fromarray((occ_fast * 255).astype(np.uint8)).save(
|
||||
str(debug_dir / f"occ_fast_retry_{retry_round + 1}.png")
|
||||
selected_seed = base_layout_seed
|
||||
if placed_count < total_target and base_layout_seed is not None:
|
||||
# The reference library samples a fresh legal position order.
|
||||
# One bounded whole-cloud re-layout recovers dense solutions
|
||||
# without per-word shrinking or an unbounded random search.
|
||||
candidate_seed = (int(base_layout_seed) * 3 + 3) % (2**31 - 1)
|
||||
retry_key = (grow_bounds, candidate_seed)
|
||||
if retry_key not in tried_layouts:
|
||||
tried_layouts.add(retry_key)
|
||||
retry_wc, retry_count, _, _ = try_place(grow_scale, candidate_seed)
|
||||
attempted_layout = True
|
||||
print(
|
||||
f" 密度优化 #{density_attempt} 整批重排: "
|
||||
f"seed={candidate_seed}, 字号=[{grow_min}, {grow_max}] -> "
|
||||
f"{retry_count}/{total_target}"
|
||||
)
|
||||
if retry_count > placed_count:
|
||||
wc = retry_wc
|
||||
placed_count = retry_count
|
||||
selected_seed = candidate_seed
|
||||
if not attempted_layout:
|
||||
break
|
||||
if placed_count < total_target:
|
||||
upper_scale = grow_scale
|
||||
continue
|
||||
|
||||
new_fill, new_occ = compute_fill_ratio_fast(wc.layout_, mask_small, config.WC_FONT_PATH)
|
||||
if new_fill <= fill_ratio:
|
||||
break
|
||||
final_wc = wc
|
||||
final_scale = grow_scale
|
||||
final_layout_seed = selected_seed
|
||||
fill_ratio = new_fill
|
||||
occ_fast = new_occ
|
||||
largest_empty_square = largest_empty_square_size(occ_fast, mask_small)
|
||||
complete_candidates.append(
|
||||
(final_wc, final_scale, final_layout_seed, fill_ratio, occ_fast)
|
||||
)
|
||||
if (
|
||||
fill_ratio >= config.TARGET_FILL_RATIO * 0.98
|
||||
and not has_character_sized_hole(final_wc, largest_empty_square)
|
||||
):
|
||||
break
|
||||
|
||||
if new_fill > fill_ratio:
|
||||
low_scale = mid_scale
|
||||
else:
|
||||
high_scale = mid_scale
|
||||
# At the largest complete equal-size tier, compare a small deterministic
|
||||
# set of whole-cloud reorderings and retain the one with the smallest
|
||||
# character-scale void. This never changes an individual font size.
|
||||
if (
|
||||
equal_size_mode
|
||||
and len(final_wc.layout_) >= total_target
|
||||
and has_character_sized_hole(final_wc, largest_empty_square)
|
||||
and base_layout_seed is not None
|
||||
):
|
||||
if total_target < 100:
|
||||
hole_attempt_budget = 3
|
||||
elif total_target <= 300:
|
||||
hole_attempt_budget = 2
|
||||
else:
|
||||
hole_attempt_budget = 1
|
||||
modulus = 2**31 - 1
|
||||
for hole_attempt in range(1, hole_attempt_budget + 1):
|
||||
candidate_seed = (
|
||||
int(base_layout_seed) ^ ((0x9E3779B9 * hole_attempt) & 0x7FFFFFFF)
|
||||
) % modulus
|
||||
bounds = scaled_bounds(final_scale)
|
||||
layout_key = (bounds, candidate_seed)
|
||||
if layout_key in tried_layouts:
|
||||
continue
|
||||
tried_layouts.add(layout_key)
|
||||
candidate_wc, placed_count, _, _ = try_place(final_scale, candidate_seed)
|
||||
if placed_count < total_target:
|
||||
continue
|
||||
candidate_fill, candidate_occ = compute_fill_ratio_fast(
|
||||
candidate_wc.layout_, mask_small, config.WC_FONT_PATH
|
||||
)
|
||||
candidate_hole = largest_empty_square_size(candidate_occ, mask_small)
|
||||
print(
|
||||
f" 空洞优化 #{hole_attempt}: seed={candidate_seed}, "
|
||||
f"最大空白={candidate_hole}px -> {placed_count}/{total_target}"
|
||||
)
|
||||
if candidate_hole >= largest_empty_square:
|
||||
continue
|
||||
final_wc = candidate_wc
|
||||
final_layout_seed = candidate_seed
|
||||
fill_ratio = candidate_fill
|
||||
occ_fast = candidate_occ
|
||||
largest_empty_square = candidate_hole
|
||||
complete_candidates.append(
|
||||
(final_wc, final_scale, final_layout_seed, fill_ratio, occ_fast)
|
||||
)
|
||||
|
||||
retry_round += 1
|
||||
hd_layout = None
|
||||
hd_clearance = None
|
||||
raw_hd_layout = []
|
||||
for candidate_index, candidate in enumerate(reversed(complete_candidates), start=1):
|
||||
candidate_wc, candidate_scale, candidate_seed, candidate_fill, candidate_occ = candidate
|
||||
raw_hd_layout = scale_layout_for_hd(candidate_wc.layout_, config.WORK_SCALE)
|
||||
refined_layout = None
|
||||
clearance_stats = None
|
||||
clearance_modes = (1, 0)
|
||||
if total_target >= 100 and candidate_index > 1:
|
||||
clearance_modes = (0,)
|
||||
for clearance_px in clearance_modes:
|
||||
priority_layout = raw_hd_layout
|
||||
priority_restarts = 0
|
||||
max_priority_attempts = 2 if clearance_px == 0 or total_target < 100 else 1
|
||||
for priority_attempt in range(max_priority_attempts):
|
||||
refined_layout, clearance_stats = refine_layout_with_hd_clearance(
|
||||
priority_layout,
|
||||
mask_hd,
|
||||
config.WC_FONT_PATH,
|
||||
clearance=clearance_px,
|
||||
)
|
||||
if refined_layout is not None:
|
||||
break
|
||||
failed_word = clearance_stats["failed_word"]
|
||||
failed_index = next(
|
||||
(index for index, item in enumerate(priority_layout) if item[0] == failed_word),
|
||||
None,
|
||||
)
|
||||
if (
|
||||
failed_index is None
|
||||
or failed_index == 0
|
||||
or priority_attempt + 1 >= max_priority_attempts
|
||||
):
|
||||
break
|
||||
failed_item = priority_layout[failed_index]
|
||||
priority_layout = [failed_item, *priority_layout[:failed_index], *priority_layout[failed_index + 1:]]
|
||||
priority_restarts += 1
|
||||
|
||||
if fill_ratio < config.MIN_ACCEPT_FILL_RATIO:
|
||||
final_wc = best_wc
|
||||
fill_ratio = best_fill
|
||||
if refined_layout is not None:
|
||||
clearance_stats["clearance_px"] = clearance_px
|
||||
clearance_stats["priority_restarts"] = priority_restarts
|
||||
break
|
||||
clearance_stats["clearance_px"] = clearance_px
|
||||
clearance_stats["priority_restarts"] = priority_restarts
|
||||
if refined_layout is None:
|
||||
log.warning(
|
||||
"高清候选 #%d 隔离精修失败: word=%s, shifted=%d, max_shift=%d",
|
||||
candidate_index,
|
||||
clearance_stats["failed_word"],
|
||||
clearance_stats["shifted_words"],
|
||||
clearance_stats["max_shift"],
|
||||
)
|
||||
hd_clearance = clearance_stats
|
||||
continue
|
||||
|
||||
print(f"最终填充率: {fill_ratio:.3f}")
|
||||
final_wc = candidate_wc
|
||||
final_scale = candidate_scale
|
||||
final_layout_seed = candidate_seed
|
||||
fill_ratio = candidate_fill
|
||||
occ_fast = candidate_occ
|
||||
largest_empty_square = largest_empty_square_size(occ_fast, mask_small)
|
||||
hd_layout = refined_layout
|
||||
hd_clearance = clearance_stats
|
||||
break
|
||||
|
||||
if hd_layout is None:
|
||||
hd_overlap_pixels = -1
|
||||
hd_layout = raw_hd_layout
|
||||
if hd_clearance is None:
|
||||
hd_clearance = {
|
||||
"shifted_words": 0,
|
||||
"max_shift": 0,
|
||||
"clearance_px": None,
|
||||
"priority_restarts": 0,
|
||||
"failed_word": None,
|
||||
}
|
||||
else:
|
||||
hd_overlap_pixels = count_layout_overlap_pixels(
|
||||
hd_layout,
|
||||
(real_hd_h, real_hd_w),
|
||||
config.WC_FONT_PATH,
|
||||
)
|
||||
|
||||
print(
|
||||
f"最终填充率: {fill_ratio:.3f} | 高清重叠像素: {hd_overlap_pixels} | "
|
||||
f"精修位移: {hd_clearance['shifted_words']} 词, 最大 {hd_clearance['max_shift']}px | "
|
||||
f"隔离带: {hd_clearance['clearance_px']}px"
|
||||
)
|
||||
return {
|
||||
"wc": final_wc,
|
||||
"fill_ratio": fill_ratio,
|
||||
@@ -268,6 +488,17 @@ def run_generation_pass(names, frequencies_data, name_weights_map, mask_hd, real
|
||||
"base_max_font": base_max_font,
|
||||
"mask_small": mask_small,
|
||||
"size_scale": final_scale,
|
||||
"layout_seed": final_layout_seed,
|
||||
"collision_margin": _collision_margin,
|
||||
"hd_overlap_pixels": hd_overlap_pixels,
|
||||
"hd_layout": hd_layout,
|
||||
"hd_clearance": hd_clearance,
|
||||
"largest_empty_square_work_px": largest_empty_square,
|
||||
"largest_empty_square_font_ratio": (
|
||||
largest_empty_square / max(1, int(final_wc.layout_[0][1]))
|
||||
if final_wc.layout_ and equal_size_mode
|
||||
else None
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
@@ -317,6 +548,7 @@ def main():
|
||||
log.info(" 平均名字长度: %.2f 字符", avg_len)
|
||||
log.info(" BASE_HD: %dx%d", config.BASE_HD_WIDTH, config.BASE_HD_HEIGHT)
|
||||
|
||||
# 只生成一次掩膜：先 probe 尺寸，再按需扩展后复用（避免二次 LANCZOS）
|
||||
probe_mask_hd, (probe_w, probe_h), _ = prepare_mask(config.BASE_HD_WIDTH, config.BASE_HD_HEIGHT)
|
||||
probe_stats = analyze_mask(probe_mask_hd)
|
||||
log.info(" Probe mask: %dx%d, free_ratio=%.4f, bbox_fill_ratio=%.4f",
|
||||
@@ -330,8 +562,12 @@ def main():
|
||||
|
||||
print("--- 3. 生成掩膜 (High Quality & Edge Fix) ---")
|
||||
log.info("--- 阶段3: 生成掩膜 ---")
|
||||
mask_hd, (real_hd_w, real_hd_h), _ = prepare_mask(hd_w, hd_h)
|
||||
mask_stats = analyze_mask(mask_hd)
|
||||
if (hd_w, hd_h) == (probe_w, probe_h):
|
||||
mask_hd, real_hd_w, real_hd_h = probe_mask_hd, probe_w, probe_h
|
||||
mask_stats = probe_stats
|
||||
else:
|
||||
mask_hd, (real_hd_w, real_hd_h), _ = prepare_mask(hd_w, hd_h)
|
||||
mask_stats = analyze_mask(mask_hd)
|
||||
log.info(" mask_hd: %dx%d", real_hd_w, real_hd_h)
|
||||
log.info(" free_area=%d, free_ratio=%.6f", mask_stats['free_area'], mask_stats['free_ratio'])
|
||||
log.info(" bbox_fill_ratio=%.6f", mask_stats['bbox_fill_ratio'])
|
||||
@@ -371,8 +607,11 @@ def main():
|
||||
print(f"Excel 权重不可用，已回退{fallback}")
|
||||
log.info(" Excel 权重不可用，已回退%s", fallback)
|
||||
|
||||
name_weights_map = dict(stroke_weights_map)
|
||||
name_weights_map.update(excel_weights_map)
|
||||
name_weights_map = merge_weight_maps(
|
||||
names,
|
||||
stroke_weights_map if config.ENABLE_STROKE_WEIGHTS else {},
|
||||
excel_weights_map,
|
||||
)
|
||||
frequencies_data = name_weights_map if config.REMOVE_DUPLICATES else [(name, name_weights_map.get(name, 10)) for name in names]
|
||||
|
||||
canvas_retry_round = 0
|
||||
@@ -389,21 +628,35 @@ def main():
|
||||
real_hd_h,
|
||||
)
|
||||
|
||||
if generation_result["wc"] is None:
|
||||
if canvas_retry_round >= config.CANVAS_RETRY_MAX_ROUNDS:
|
||||
print("生成失败：未找到合适布局")
|
||||
log.error("生成失败：未找到合适布局 (已重试 %d 轮)", canvas_retry_round)
|
||||
wc = generation_result.get("wc")
|
||||
placed = len(wc.layout_) if wc is not None else 0
|
||||
target = len(names) * config.N_REPETITIONS
|
||||
# 名单完整性是硬约束。填充率优化不得以漏掉姓名为代价。
|
||||
hd_overlap_pixels = int(generation_result.get("hd_overlap_pixels", 0))
|
||||
placement_ok = wc is not None and placed >= target and hd_overlap_pixels == 0
|
||||
|
||||
if placement_ok or canvas_retry_round >= config.CANVAS_RETRY_MAX_ROUNDS:
|
||||
if not placement_ok:
|
||||
print(
|
||||
f"生成失败：放置 {placed}/{target}，高清重叠像素 {hd_overlap_pixels}，"
|
||||
"未满足完整名单与零碰撞约束"
|
||||
)
|
||||
log.error(
|
||||
"生成失败：放置 %d/%d, 高清重叠像素=%d (已重试 %d 轮)",
|
||||
placed,
|
||||
target,
|
||||
hd_overlap_pixels,
|
||||
canvas_retry_round,
|
||||
)
|
||||
sys.exit(1)
|
||||
log.warning(" 本轮生成失败 (wc=None), 将重试")
|
||||
elif generation_result["fill_ratio"] >= config.MIN_ACCEPT_FILL_RATIO or canvas_retry_round >= config.CANVAS_RETRY_MAX_ROUNDS:
|
||||
log.info(" 生成成功! fill_ratio=%.4f (要求>=%.4f), 重试轮次=%d",
|
||||
generation_result['fill_ratio'], config.MIN_ACCEPT_FILL_RATIO, canvas_retry_round)
|
||||
log.info(" 生成完成 placed=%d/%d fill=%.4f retry=%d",
|
||||
placed, target, generation_result["fill_ratio"], canvas_retry_round)
|
||||
break
|
||||
|
||||
canvas_retry_round += 1
|
||||
next_w = int(real_hd_w * config.CANVAS_RETRY_GROWTH)
|
||||
next_h = int(real_hd_h * config.CANVAS_RETRY_GROWTH)
|
||||
print(f"[画布重试#{canvas_retry_round}] {real_hd_w}x{real_hd_h} -> {next_w}x{next_h}")
|
||||
print(f"[画布重试#{canvas_retry_round}] {real_hd_w}x{real_hd_h} -> {next_w}x{next_h} (放置 {placed}/{target})")
|
||||
log.info("[画布重试#%d] %dx%d -> %dx%d (growth=%.2f)",
|
||||
canvas_retry_round, real_hd_w, real_hd_h, next_w, next_h, config.CANVAS_RETRY_GROWTH)
|
||||
mask_hd, (real_hd_w, real_hd_h), _ = prepare_mask(next_w, next_h)
|
||||
@@ -419,12 +672,7 @@ def main():
|
||||
print("--- 6. 高清渲染 ---")
|
||||
log.info("--- 阶段6: 高清渲染 ---")
|
||||
t_render = time.time()
|
||||
hd_layout = []
|
||||
for text, size, (y, x), orient, color in final_wc.layout_:
|
||||
hd_size = int(size / config.WORK_SCALE)
|
||||
hd_y = int(y / config.WORK_SCALE)
|
||||
hd_x = int(x / config.WORK_SCALE)
|
||||
hd_layout.append((text, hd_size, (hd_y, hd_x), orient, color))
|
||||
hd_layout = generation_result["hd_layout"]
|
||||
|
||||
log.info(" HD layout 词数: %d", len(hd_layout))
|
||||
log.info(" HD 画布: %dx%d", real_hd_w, real_hd_h)
|
||||
@@ -439,26 +687,17 @@ def main():
|
||||
final_wc.height = real_hd_h
|
||||
|
||||
base_img = final_wc.to_image().convert("RGB")
|
||||
if config.ENABLE_DOT_MATRIX:
|
||||
base_img = apply_dot_matrix(base_img, mask_hd)
|
||||
|
||||
base_img.save(config.OUTPUT_PNG)
|
||||
# 更快的 PNG 写出（压缩等级 1，视觉无损）
|
||||
base_img.save(config.OUTPUT_PNG, compress_level=1)
|
||||
print(f"已保存: {config.OUTPUT_PNG}")
|
||||
log.info(" PNG 已保存: %s (%.2f MB)", config.OUTPUT_PNG,
|
||||
Path(config.OUTPUT_PNG).stat().st_size / 1024 / 1024 if Path(config.OUTPUT_PNG).exists() else 0)
|
||||
final_wc.to_svg(config.OUTPUT_SVG)
|
||||
# 一次构建路径，同时写出 fill / stroke 两份 SVG
|
||||
stroke_svg = final_wc.export_svgs(config.OUTPUT_SVG)
|
||||
print(f"已保存: {config.OUTPUT_SVG}")
|
||||
log.info(" SVG 已保存: %s (%.2f MB)", config.OUTPUT_SVG,
|
||||
Path(config.OUTPUT_SVG).stat().st_size / 1024 / 1024 if Path(config.OUTPUT_SVG).exists() else 0)
|
||||
|
||||
# 描边版 SVG（激光雕刻用）
|
||||
stroke_svg = str(Path(config.OUTPUT_SVG).with_name(
|
||||
Path(config.OUTPUT_SVG).stem + "_stroke" + Path(config.OUTPUT_SVG).suffix
|
||||
))
|
||||
final_wc.to_svg_stroke(stroke_svg)
|
||||
print(f"已保存: {stroke_svg}")
|
||||
log.info(" SVG(stroke) 已保存: %s (%.2f MB)", stroke_svg,
|
||||
Path(stroke_svg).stat().st_size / 1024 / 1024 if Path(stroke_svg).exists() else 0)
|
||||
log.info(" SVG 已保存: %s", config.OUTPUT_SVG)
|
||||
log.info(" SVG(stroke) 已保存: %s", stroke_svg)
|
||||
log.info(" 渲染耗时: %.2fs", time.time() - t_render)
|
||||
|
||||
log.info("--- 阶段7: 写入数据库 ---")
|
||||
@@ -482,27 +721,35 @@ def main():
|
||||
box_height INTEGER
|
||||
)
|
||||
""")
|
||||
bbox_canvas = Image.new("L", (1, 1), 0)
|
||||
bbox_draw = ImageDraw.Draw(bbox_canvas)
|
||||
# Cache full font bearings as well as dimensions so search highlights
|
||||
# match the actual PIL-rendered glyph position.
|
||||
bbox_cache = {}
|
||||
_measure = ImageDraw.Draw(Image.new("L", (1, 1)))
|
||||
db_data = []
|
||||
for name, font_size, (y, x), orient, color in final_wc.layout_:
|
||||
font = get_cached_font(config.WC_FONT_PATH, max(1, int(font_size)))
|
||||
orientation = "vertical" if orient else "horizontal"
|
||||
if orient:
|
||||
font = ImageFont.TransposedFont(font, orientation=orient)
|
||||
bbox = bbox_draw.textbbox((x, y), name, font=font)
|
||||
key = (name, int(font_size), bool(orient))
|
||||
box = bbox_cache.get(key)
|
||||
if box is None:
|
||||
font = get_cached_font(config.WC_FONT_PATH, max(1, int(font_size)))
|
||||
if orient:
|
||||
font = ImageFont.TransposedFont(font, orientation=orient)
|
||||
bb = _measure.textbbox((0, 0), name, font=font)
|
||||
box = (bb[0], bb[1], bb[2] - bb[0], bb[3] - bb[1])
|
||||
bbox_cache[key] = box
|
||||
bx, by, bw, bh = box
|
||||
db_data.append(
|
||||
(
|
||||
name,
|
||||
x,
|
||||
y,
|
||||
x + bx,
|
||||
y + by,
|
||||
font_size,
|
||||
color,
|
||||
orientation,
|
||||
bbox[0],
|
||||
bbox[1],
|
||||
bbox[2] - bbox[0],
|
||||
bbox[3] - bbox[1],
|
||||
x,
|
||||
y,
|
||||
bw,
|
||||
bh,
|
||||
)
|
||||
)
|
||||
cursor.executemany(
|
||||
@@ -525,11 +772,18 @@ def main():
|
||||
placed_count = len(final_wc.layout_)
|
||||
metrics = {
|
||||
"seed": config.SEED,
|
||||
"layout_order_mode": config.LAYOUT_ORDER_MODE,
|
||||
"layout_seed": config.LAYOUT_SEED,
|
||||
"layout_seed": generation_result.get("layout_seed", config.LAYOUT_SEED),
|
||||
"input_count": input_count,
|
||||
"placed_count": placed_count,
|
||||
"fill_ratio": fill_ratio,
|
||||
"largest_empty_square_work_px": int(
|
||||
generation_result.get("largest_empty_square_work_px", 0)
|
||||
),
|
||||
"largest_empty_square_font_ratio": generation_result.get(
|
||||
"largest_empty_square_font_ratio"
|
||||
),
|
||||
"hd_overlap_pixels": int(generation_result.get("hd_overlap_pixels", -1)),
|
||||
"hd_clearance": generation_result.get("hd_clearance"),
|
||||
"elapsed_seconds": round(elapsed, 4),
|
||||
"font_info": {
|
||||
"layout_font_path": config.WC_FONT_PATH,
|
||||
@@ -563,12 +817,8 @@ def main():
|
||||
"output_dir": config.OUTPUT_DIR,
|
||||
"output_prefix": config.OUTPUT_PREFIX,
|
||||
"min_font_size": config.MIN_FONT_SIZE,
|
||||
"max_attempts": config.MAX_ATTEMPTS,
|
||||
"fill_on": config.FILL_ON,
|
||||
"min_accept_fill_ratio": config.MIN_ACCEPT_FILL_RATIO,
|
||||
"require_all_words": config.REQUIRE_ALL_WORDS,
|
||||
"layout_order_mode": config.LAYOUT_ORDER_MODE,
|
||||
"layout_seed": config.LAYOUT_SEED,
|
||||
"layout_seed": generation_result.get("layout_seed", config.LAYOUT_SEED),
|
||||
}
|
||||
}
|
||||
config.write_metrics(metrics)
|
||||
|
||||
Reference in New Issue
Block a user