From 306a88e964dbc51794ab768a4d1928265a2eb2ba Mon Sep 17 00:00:00 2001 From: umsangdon Date: Sat, 31 Oct 2026 22:45:14 +0900 Subject: [PATCH] =?UTF-8?q?fix(D03=20=EA=B8=8B=EA=B8=B0):=20=EA=B8=8B?= =?UTF-8?q?=EB=8A=94=20=EC=A4=91=20=EB=86=93=EC=9D=B8=20=EC=A0=90=EC=9D=B4?= =?UTF-8?q?=20=EB=B6=80=EC=B1=84=EA=BC=B4=20=C2=B7=20=EC=A0=90=EC=84=A0=20?= =?UTF-8?q?=EC=9B=90=20=EC=9C=84=EC=97=90=20=EB=B3=B4=EC=9E=84=20=C2=B7=20?= =?UTF-8?q?=EC=A2=81=EC=9D=80=20=ED=8F=AD=EC=97=90=EC=84=9C=20=EB=8F=84?= =?UTF-8?q?=EA=B5=AC=EC=A4=84=20=EC=A4=84=EB=B0=94=EA=BF=88=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20[LAS=20=EC=98=AC=EB=A6=AC=EA=B8=B0]=20=EC=95=88=20?= =?UTF-8?q?=EC=9E=98=EB=A6=BC=20(PLAN=20625-4=20=C2=B7=20=EC=A0=90?= =?UTF-8?q?=EA=B2=80=20535-3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DrawPaint `paintNetwork` 미리보기(부채꼴 · 원) 먼저 · 놓인 점 그 위 - D03 도구줄 CSS 줄바꿈(공용 한 줄 밀기 · B05 그대로) - 시험 test_625_draw 순서 · 줄바꿈 지킴 하나 덧 Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_015uTVHDYKk4dyt7bEAQKcVU --- D03_PlanAnalysis/D03_PlanAnalysis_UI_DrawPaint.ts | 2 +- D03_PlanAnalysis/D03_PlanAnalysis_UI_Style.css | 8 ++++++++ resources/tester/test_625_draw.py | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/D03_PlanAnalysis/D03_PlanAnalysis_UI_DrawPaint.ts b/D03_PlanAnalysis/D03_PlanAnalysis_UI_DrawPaint.ts index 473c58f78..90a474132 100644 --- a/D03_PlanAnalysis/D03_PlanAnalysis_UI_DrawPaint.ts +++ b/D03_PlanAnalysis/D03_PlanAnalysis_UI_DrawPaint.ts @@ -215,9 +215,9 @@ export function paintNetwork( ); if (map.slopes) segmentLabels(context, map, line.vertices, z); }); + extra(); // 미리보기(부채꼴 · 원) 먼저 — 놓인 점이 그 위에 보임(625-4) paintNodes(context, map, network.lines, z); drawPieces(context, map, network); - extra(); } /** 꺾임점 = 들어온 구간 기울기 부호 색(625-2 B4) · 선보다 굵은 점 + 검은 테 = 선 색 · 위성 위에서도 가름(625-3) · diff --git a/D03_PlanAnalysis/D03_PlanAnalysis_UI_Style.css b/D03_PlanAnalysis/D03_PlanAnalysis_UI_Style.css index c08519723..912b05fda 100644 --- a/D03_PlanAnalysis/D03_PlanAnalysis_UI_Style.css +++ b/D03_PlanAnalysis/D03_PlanAnalysis_UI_Style.css @@ -52,6 +52,14 @@ align-items: flex-end; } +/* 625-4 — 좁은 폭에서 오른쪽 끝(지형 칩 · LAS 올리기)이 가로 밀림에 잘리지 않게 줄바꿈(공용 한 줄 밀기는 B05 그대로) */ +.ui-map-tools.d03-plan__tools > .ui-toolbar { + flex-wrap: wrap; + justify-content: flex-end; + overflow: visible; + mask-image: none; +} + /* 624-4 도구줄 끝 지형 칸 — 지형 칩 · LAS 올리기 · 진행 서클 한 줄 */ .d03-plan__terrain { display: flex; diff --git a/resources/tester/test_625_draw.py b/resources/tester/test_625_draw.py index 3bdb02a28..08ec131b2 100644 --- a/resources/tester/test_625_draw.py +++ b/resources/tester/test_625_draw.py @@ -175,3 +175,15 @@ def test_놓인_노드_부호_색_선_위_고름_위에도_보임(): draw = edit[edit.index("draw(context, map) {") :] assert draw.index("sel.paths()") < draw.index("paintNodes(") < draw.index("context.rect(") assert "fillRect" not in draw[: draw.index("고른 노드 · 마크 테")] + + +def test_놓인_노드_미리보기_부채꼴_원_위에_그림(): + """625-4 — paintNetwork 는 미리보기(extra) 를 먼저 그리고 놓인 점(paintNodes)을 그 위에 · D03 도구줄은 줄바꿈.""" + paint = (ROOT / "D03_PlanAnalysis" / "D03_PlanAnalysis_UI_DrawPaint.ts").read_text( + encoding="utf-8" + ) + body = paint[paint.index("export function paintNetwork") :] + body = body[: body.index("\n}\n")] + assert body.index("extra();") < body.index("paintNodes(") + css = (ROOT / "D03_PlanAnalysis" / "D03_PlanAnalysis_UI_Style.css").read_text(encoding="utf-8") + assert re.search(r"\.d03-plan__tools > \.ui-toolbar \{[^}]*flex-wrap: wrap", css)