Merge remote-tracking branches 'origin/sub_laptop_5' and 'origin/sub_laptop_8' into sub_laptop_4

2026-10-01 23:41:45 +09:00
parent 3b1dd532aa 3ea0c0fdf2 deabd978c0
commit 2abd3d46ae
6 changed files with 57 additions and 42 deletions
@@ -43,7 +43,7 @@ const out = jobs.map((job) => {
  if (job.op === "deps") return m.depLines(job.lg).map((d) => ({ id: d.id, from: d.from, to: d.to }));
  if (job.op === "inTrace") return m.depLines(job.lg).map((d) => m.depInTrace(d, job.steps));
  if (job.op === "rest") return job.breaks.map((b) => m.isRest(b));
-  if (job.op === "fit") return m.fitView(job.rects, job.view);
+  if (job.op === "fit") return m.fitView(job.rects, job.view, 40, job.min);
  if (job.op === "value") return job.values.map((v) => m.showValue(v));
  if (job.op === "end") return m.depEnd(job.a, job.tag);
  if (job.op === "restParts") {
@@ -404,3 +404,18 @@ def test_지반_토사_쉼_흐림은_브레이커로_깨기_하나():
    assert got["boxes"] == ["brk"]
    assert got["links"] == ["l2", "l6"]
    assert got["pills"] == ["brk|굴착량", "sum|브레이커 경비"]
+
+
+def test_패널_처음_배율은_읽히는_최소_넘치면_왼쪽_위부터():
+    rects = [{"x": 40, "y": 40, "w": 200, "h": 120}, {"x": 1500, "y": 600, "w": 200, "h": 120}]
+    auto, whole = run(
+        [
+            {"op": "fit", "rects": rects, "view": {"w": 500, "h": 400}, "min": 0.6},
+            {"op": "fit", "rects": rects, "view": {"w": 500, "h": 400}, "min": 0.25},
+        ]
+    )
+    # 처음 — 0.6 아래로 안 내림 · 넘치면 왼쪽 위(첫 상자 - 여백)가 판 왼쪽 위
+    assert auto["zoom"] == 0.6
+    assert auto["panX"] == 0 and auto["panY"] == 0
+    # 한눈에 — 전체가 들어가게 더 작게
+    assert whole["zoom"] < 0.6