From 90f68d4033f7987f93a8689f146cba69ff790619 Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 15:40:35 +0000 Subject: [PATCH 1/5] Retarget Y-normal datums when side strip is absent --- src/draftwright/annotations/_gdt.py | 20 +++++++++++++++++++- tests/test_gdt_placement.py | 15 +++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/draftwright/annotations/_gdt.py b/src/draftwright/annotations/_gdt.py index 440d03f8..d98d15a3 100644 --- a/src/draftwright/annotations/_gdt.py +++ b/src/draftwright/annotations/_gdt.py @@ -4,7 +4,7 @@ import math from collections.abc import Callable -from dataclasses import dataclass +from dataclasses import dataclass, replace from typing import Any from build123d import Align, Location, Mode, ShapeList, Sketch, Text, Vector @@ -59,6 +59,23 @@ _MIN_LEADER = 0.05 +def _datum_alternate_view(item, views): + """Retarget a Y-normal datum to its other edge-on view if its strip is absent.""" + if not ( + isinstance(item, DatumRef) + and item.reference_surface_kind == "plane" + and item.frame.axis == "y" + and item.view == "side" + and item.side in ("left", "right") + and getattr(views["side"][0], item.side) is None + ): + return item + side = "below" if item.side == "left" else "above" + if getattr(views["plan"][0], side) is None: + return item + return replace(item, view="plan", side=side) + + @dataclass(frozen=True, slots=True) class _GdtDropState: """One declared frame's identity and geometry retained until post-drain retry.""" @@ -802,6 +819,7 @@ def render_gdt( tb_box = _title_block_box(dwg, a) n = 0 for i, item in enumerate(items): + item = _datum_alternate_view(item, views) name = f"m_gdt{i}" source_ids = source_ids_for(item) satisfaction = tuple( diff --git a/tests/test_gdt_placement.py b/tests/test_gdt_placement.py index 0c320af1..e6eaf05e 100644 --- a/tests/test_gdt_placement.py +++ b/tests/test_gdt_placement.py @@ -412,7 +412,7 @@ def forbidden_sheet_route(*_args, **_kwargs): assert [attempt["side"] for attempt in events[0]["items"][0]["attempts"]] == ["left"] -def test_imported_datum_on_absent_side_strip_drops_without_aborting_issue_2182(tmp_path): +def test_imported_datum_on_absent_side_strip_tries_normal_plan_edge_issue_2182(tmp_path): datum = DatumRef( frame=Frame((0.0, -25.0, 0.0), "y"), letter="A", @@ -436,14 +436,17 @@ def test_imported_datum_on_absent_side_strip_drops_without_aborting_issue_2182(t assert "m_gdt0" not in dwg.annotations() assert "m_gdt1" in dwg.annotations() assert any( - issue.code == "pmi_dropped" and "m_gdt0" in issue.message for issue in dwg.registry.issues + issue.code == "pmi_dropped" + and "m_gdt0" in issue.message + and "surface-normal below strip" in issue.message + for issue in dwg.registry.issues ) solves = json.loads(trace_path.read_text())["solves"] assert any( - solve["corridor"] == ["side", "left"] - and solve["strip"] is None - and {item["name"] for item in solve["candidates"]} == {"m_gdt0"} - and solve["outcomes"] == [{"name": "m_gdt0", "outcome": "dropped", "reason": "no_strip"}] + solve["corridor"] == ["plan", "below"] + and solve["strip"] is not None + and "m_gdt0" in {candidate["name"] for candidate in solve["candidates"]} + and any(outcome["name"] == "m_gdt0" for outcome in solve["outcomes"]) for solve in solves ) From ccc385424a4000f4c8288a7f585cbce8b218f54c Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 15:50:28 +0000 Subject: [PATCH 2/5] Require selected plan view for datum fallback --- src/draftwright/annotations/_gdt.py | 5 +++-- tests/test_gdt_placement.py | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/draftwright/annotations/_gdt.py b/src/draftwright/annotations/_gdt.py index d98d15a3..fa51f86f 100644 --- a/src/draftwright/annotations/_gdt.py +++ b/src/draftwright/annotations/_gdt.py @@ -59,7 +59,7 @@ _MIN_LEADER = 0.05 -def _datum_alternate_view(item, views): +def _datum_alternate_view(item, views, selected_views): """Retarget a Y-normal datum to its other edge-on view if its strip is absent.""" if not ( isinstance(item, DatumRef) @@ -67,6 +67,7 @@ def _datum_alternate_view(item, views): and item.frame.axis == "y" and item.view == "side" and item.side in ("left", "right") + and "plan" in selected_views and getattr(views["side"][0], item.side) is None ): return item @@ -819,7 +820,7 @@ def render_gdt( tb_box = _title_block_box(dwg, a) n = 0 for i, item in enumerate(items): - item = _datum_alternate_view(item, views) + item = _datum_alternate_view(item, views, dwg.views) name = f"m_gdt{i}" source_ids = source_ids_for(item) satisfaction = tuple( diff --git a/tests/test_gdt_placement.py b/tests/test_gdt_placement.py index e6eaf05e..9388063b 100644 --- a/tests/test_gdt_placement.py +++ b/tests/test_gdt_placement.py @@ -13,6 +13,7 @@ import math from collections import defaultdict from pathlib import Path +from types import SimpleNamespace from xml.etree import ElementTree import ezdxf @@ -20,6 +21,7 @@ from build123d import Box, Cylinder, Draft, Pos from build123d_drafting import DatumFeature, FeatureControlFrame, Leader +from draftwright.annotations._gdt import _datum_alternate_view from draftwright.builder import build_drawing, detect_part_model from draftwright.linting.structural import lint_drawing from draftwright.model.ir import ControlFrame, DatumRef, Finish, Frame, Note, PmiFeature @@ -451,6 +453,23 @@ def test_imported_datum_on_absent_side_strip_tries_normal_plan_edge_issue_2182(t ) +def test_datum_alternate_view_requires_a_selected_plan_view(): + datum = DatumRef( + frame=Frame((0.0, -25.0, 0.0), "y"), + letter="B", + view="side", + side="left", + reference_surface_kind="plane", + ) + zones = { + "side": (SimpleNamespace(left=None),), + "plan": (SimpleNamespace(below=object()),), + } + assert _datum_alternate_view(datum, zones, {"side": object()}) is datum + alternate = _datum_alternate_view(datum, zones, {"side": object(), "plan": object()}) + assert (alternate.view, alternate.side, alternate.letter) == ("plan", "below", "B") + + def test_projected_datum_stem_keeps_both_near_and_far_datums_issue_2128(): part = Box(80, 50, 20) near = DatumRef(frame=Frame((0, 0, -10), "z"), letter="A", view="front", side="below") From 542549c58ff46b866abcdcd1b9fa636313416011 Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 15:52:26 +0000 Subject: [PATCH 3/5] Keep declared datum view intent fixed --- src/draftwright/annotations/_gdt.py | 1 + tests/test_gdt_placement.py | 36 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/draftwright/annotations/_gdt.py b/src/draftwright/annotations/_gdt.py index fa51f86f..2d8dc103 100644 --- a/src/draftwright/annotations/_gdt.py +++ b/src/draftwright/annotations/_gdt.py @@ -63,6 +63,7 @@ def _datum_alternate_view(item, views, selected_views): """Retarget a Y-normal datum to its other edge-on view if its strip is absent.""" if not ( isinstance(item, DatumRef) + and getattr(item.origin, "source_category", None) == "datum" and item.reference_surface_kind == "plane" and item.frame.axis == "y" and item.view == "side" diff --git a/tests/test_gdt_placement.py b/tests/test_gdt_placement.py index 9388063b..54885767 100644 --- a/tests/test_gdt_placement.py +++ b/tests/test_gdt_placement.py @@ -415,12 +415,23 @@ def forbidden_sheet_route(*_args, **_kwargs): def test_imported_datum_on_absent_side_strip_tries_normal_plan_edge_issue_2182(tmp_path): + origin = PmiFeature( + frame=Frame((0.0, -25.0, 0.0), "y"), + pmi_kind="datum", + value=0.0, + label="A", + dominant_axis="Y", + ref_bbox=(-40.0, -25.0, -10.0, 40.0, -25.0, 10.0), + source_category="datum", + reference_axis="Y", + ) datum = DatumRef( frame=Frame((0.0, -25.0, 0.0), "y"), letter="A", view="side", side="left", source_id="datum:missing-side-strip", + origin=origin, reference_surface_kind="plane", ) surviving_frame = ControlFrame( @@ -454,11 +465,22 @@ def test_imported_datum_on_absent_side_strip_tries_normal_plan_edge_issue_2182(t def test_datum_alternate_view_requires_a_selected_plan_view(): + origin = PmiFeature( + frame=Frame((0.0, -25.0, 0.0), "y"), + pmi_kind="datum", + value=0.0, + label="B", + dominant_axis="Y", + ref_bbox=(-40.0, -25.0, -10.0, 40.0, -25.0, 10.0), + source_category="datum", + reference_axis="Y", + ) datum = DatumRef( frame=Frame((0.0, -25.0, 0.0), "y"), letter="B", view="side", side="left", + origin=origin, reference_surface_kind="plane", ) zones = { @@ -468,6 +490,20 @@ def test_datum_alternate_view_requires_a_selected_plan_view(): assert _datum_alternate_view(datum, zones, {"side": object()}) is datum alternate = _datum_alternate_view(datum, zones, {"side": object(), "plan": object()}) assert (alternate.view, alternate.side, alternate.letter) == ("plan", "below", "B") + assert ( + _datum_alternate_view( + DatumRef( + frame=datum.frame, + letter="B", + view="side", + side="left", + reference_surface_kind="plane", + ), + zones, + {"side": object(), "plan": object()}, + ).view + == "side" + ) def test_projected_datum_stem_keeps_both_near_and_far_datums_issue_2128(): From 945ee4c5fe2dc9b33ebce55839b4332fdf14ca30 Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 16:13:17 +0000 Subject: [PATCH 4/5] Cover absent alternate datum strip --- tests/test_gdt_placement.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test_gdt_placement.py b/tests/test_gdt_placement.py index 54885767..2dab8f77 100644 --- a/tests/test_gdt_placement.py +++ b/tests/test_gdt_placement.py @@ -488,6 +488,16 @@ def test_datum_alternate_view_requires_a_selected_plan_view(): "plan": (SimpleNamespace(below=object()),), } assert _datum_alternate_view(datum, zones, {"side": object()}) is datum + no_plan_strip = { + "side": zones["side"], + "plan": (SimpleNamespace(below=None),), + } + assert ( + _datum_alternate_view( + datum, no_plan_strip, {"side": object(), "plan": object()} + ) + is datum + ) alternate = _datum_alternate_view(datum, zones, {"side": object(), "plan": object()}) assert (alternate.view, alternate.side, alternate.letter) == ("plan", "below", "B") assert ( From 24b3d6782a67e83126b05e030067960c4e80feed Mon Sep 17 00:00:00 2001 From: Paul Fremantle Date: Tue, 6 Oct 2026 16:21:17 +0000 Subject: [PATCH 5/5] Format alternate datum regression --- tests/test_gdt_placement.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/test_gdt_placement.py b/tests/test_gdt_placement.py index 2dab8f77..8936957f 100644 --- a/tests/test_gdt_placement.py +++ b/tests/test_gdt_placement.py @@ -493,10 +493,7 @@ def test_datum_alternate_view_requires_a_selected_plan_view(): "plan": (SimpleNamespace(below=None),), } assert ( - _datum_alternate_view( - datum, no_plan_strip, {"side": object(), "plan": object()} - ) - is datum + _datum_alternate_view(datum, no_plan_strip, {"side": object(), "plan": object()}) is datum ) alternate = _datum_alternate_view(datum, zones, {"side": object(), "plan": object()}) assert (alternate.view, alternate.side, alternate.letter) == ("plan", "below", "B")