draw_material_hatch's handles branch read only the traced loop's `points`
and dropped the parallel `bulges`, so a cut face bounded by an arc was
hatched as the chord polygon - exactly the failure README.md and the
comment at backends/ezdxf_backend.py:1172-1176 name. MEASURED headless on
a 40x10 box closed by a 180 degree r=20 arc: boundary_from_entities ->
area 1028.318531, draw_material_hatch -> {'ok': True, 'points': 4} and
entity_measure(hatch) -> {'area': 400.0, 'exact': True}. 628.3 mm2, 61% of
the face, silently unhatched, and the payload stated no accuracy.
entity_create_hatch takes a vertex list on both engines, so an arc edge has
to reach it as vertices; the bug was dropping the curve, not the fact of
vertices. Each bulged segment is now expanded onto its real arc by
_flatten_bulge, spaced so no chord departs from it by more than the
declared HATCH_FLATTEN_SAGITTA (0.01). Same repro after: points 53, area
1027.905195 against the exact 1028.318531 - an error of 0.413 (0.040%),
and the payload says so rather than claiming exactness: `accuracy`
"flatten_tolerance" or "exact", `flatten_tolerance`, `curved_edges`,
`area` (the polygon actually written) and `boundary_area` (the loop's own
exact area) so the two can be compared instead of trusted. `accuracy` is
decided by comparing those two numbers, so a backend that reports no
`bulges` at all is still reported approximate rather than assumed exact. A
straight-sided face reads `exact` / 400.0 as before.
The handles branch also had no area guard - the "at least three points"
refusal only ever covered `boundary` - so a LINE plus a 180 degree ARC
traced to a two-vertex loop and wrote a HATCH of area 0.0 with ok: True.
That case now hatches the real semicircle (37 points, 156.880337 of
157.079633), and a loop that genuinely encloses nothing (three collinear
segments, boundary_from_entities area 0.0) is refused by name before
anything is written: "the hatch boundary encloses no area (measured 0)".
Second: boundary_from_entities does not merely compute a loop, it *writes*
one. The traced LWPOLYLINE was left in the drawing on layer 0 and named
nowhere in the result, so the caller could neither find nor delete it, and
drawing_critique / drawing_finalize scored it against the drawing under the
layer-discipline rule. MEASURED headless on a 40x10 rectangle of four
LINEs: 4 entities before, 6 after, by_type {'LINE': 4, 'LWPOLYLINE': 1,
'HATCH': 1}, the polyline on layer '0'. After: 5 entities, {'LINE': 4,
'HATCH': 1}, and the result carries traced {'handle': '34', 'removed':
True} - the boolean is reported rather than assumed, so a delete that
failed is visible. The delete runs in a `finally:`, so the refusal paths
above do not leave scaffolding either (3 entities before and after).
Third: the module SOURCE block asserted the cutting-plane line's thin
middle was "the `center` role (CENTER, 0.25 mm)" and that the pair gave
"the ISO appearance" at 2:1. engineering/layers.py:19 defines CENTER at
0.18. MEASURED headless after draw_section_line on a fresh EzdxfBackend:
layer_list reports GEOMETRY lineweight 50.0 and CENTER 18.0, i.e. 0.50/0.18
= 2.78:1. A fabricated number in a standards SOURCE block is the one thing
these blocks exist to prevent, so the block now states the measured pair,
names the ratio as 2.78:1, and does *not* quote the standard's own
wide:narrow ratio, which this module cannot transcribe. The wrong figure in
the previous commit message (64a57d7) stands uncorrected in history; this
paragraph is the correction.
Tests (all four fail against the reviewed code, verified by re-running them
with _flatten_bulge and _discard_traced_loop stubbed back to the old
behaviour: 3 failed, and the SOURCE-block assertions checked against
HEAD:engineering/mech/marks.py -> [False, False, False]):
- test_a_bulged_segment_is_expanded_onto_its_real_arc - every emitted
vertex on the circle, every chord sagitta inside the tolerance
- test_an_arc_bounded_cut_face_is_hatched_on_the_arc_not_its_chord -
and entity_measure agrees with the payload
- test_a_straight_sided_face_is_still_reported_exact
- test_the_traced_outline_is_removed_and_reported_not_left_on_layer_0
- test_a_loop_that_encloses_no_area_is_refused_and_leaves_nothing_behind
- test_the_polygon_area_helper_is_orientation_blind
- test_the_section_line_source_block_quotes_the_layer_set_it_draws_on -
reads ENGINEERING_LAYERS, so the sentence cannot drift again
- test_the_cutting_plane_line_really_lands_on_those_two_lineweights
No new ActiveX call was written, and nothing changed here can reach a live
seat: boundary_from_entities is capability-refused on COM
(backends/com_backend.py:1488, boundary_trace
FeatureCapability(False, "no_activex_member_command_only")), so the
handles branch is headless-only; the `boundary` branch is unchanged but for
the added payload keys. The live seat could not be reached to re-measure it
anyway - GetActiveObject("AutoCAD.Application") blocked without returning
on three attempts over ~370 s while acad.exe was running (sibling
contention), so the live engine was unavailable rather than absent.
server.py's hatch_material docstring now states the accuracy keys and the
traced-outline deletion; the tool summary is unchanged, and
scripts/generate_tool_inventory.py reproduces docs/tool-inventory.json
byte-for-byte (209 tools), so no registration moved.
tests/test_mech_marks.py: 25 passed (17 -> 25). Gates: ruff check clean
over the tree, ruff format clean, test_tool_registry, test_tool_inventory,
test_capability_contract, test_discovery_aliases, test_boundary_trace,
test_measure and test_release_consistency all pass. Full suite:
3351 passed, 24 skipped, 1 xfailed; the same 6 pre-existing failures
(test_benchmark_v4, test_capabilities, test_layouts_solids, test_page_setup,
test_sprint2_fixes, test_viewport_ops) verified identical with this change
stashed, and test_release_consistency.py::test_document_numbers_match_the_tree
deselected as Global Constraints instructs.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FKFStjEFzpGyLq5bMpWxTd
496 lines
22 KiB
Python
496 lines
22 KiB
Python
"""Centre marks (ISO 128-23), the cutting-plane line (ISO 128-40) and material hatch.
|
|
|
|
Pure geometry asserted as emitted primitive tuples; the async layer against a
|
|
real ezdxf document through the `backend` fixture.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import math
|
|
|
|
import pytest
|
|
|
|
from engineering.mech.marks import (
|
|
CENTRE_STYLES,
|
|
centre_mark_prims,
|
|
)
|
|
from engineering.mech.primitives import Line
|
|
|
|
pytestmark = pytest.mark.asyncio
|
|
|
|
EPS = 1e-9
|
|
|
|
|
|
def _flat(points):
|
|
"""Flatten a point sequence: pytest.approx refuses nested structures."""
|
|
return tuple(float(value) for point in points for value in point)
|
|
|
|
|
|
async def test_a_centre_mark_is_a_small_cross_on_the_centre_role():
|
|
prims = centre_mark_prims((10.0, 20.0), 5.0, style="mark", extension=3.0)
|
|
assert len(prims) == 2
|
|
horizontal, vertical = prims
|
|
assert isinstance(horizontal, Line) and isinstance(vertical, Line)
|
|
assert horizontal.p1 == pytest.approx((7.0, 20.0), abs=EPS)
|
|
assert horizontal.p2 == pytest.approx((13.0, 20.0), abs=EPS)
|
|
assert vertical.p1 == pytest.approx((10.0, 17.0), abs=EPS)
|
|
assert vertical.p2 == pytest.approx((10.0, 23.0), abs=EPS)
|
|
assert horizontal.role == "center" and vertical.role == "center"
|
|
|
|
|
|
async def test_centre_lines_cross_the_circle_and_overrun_it_by_the_extension():
|
|
prims = centre_mark_prims((10.0, 20.0), 5.0, style="lines", extension=3.0)
|
|
horizontal, vertical = prims
|
|
assert horizontal.p1 == pytest.approx((2.0, 20.0), abs=EPS)
|
|
assert horizontal.p2 == pytest.approx((18.0, 20.0), abs=EPS)
|
|
assert vertical.p1 == pytest.approx((10.0, 12.0), abs=EPS)
|
|
assert vertical.p2 == pytest.approx((10.0, 28.0), abs=EPS)
|
|
assert horizontal.role == "center" and vertical.role == "center"
|
|
|
|
|
|
async def test_the_style_enum_is_closed_and_a_bad_radius_is_refused():
|
|
assert CENTRE_STYLES == ("mark", "lines")
|
|
with pytest.raises(ValueError) as excinfo:
|
|
centre_mark_prims((0.0, 0.0), 5.0, style="cross")
|
|
assert "mark, lines" in str(excinfo.value)
|
|
with pytest.raises(ValueError) as excinfo:
|
|
centre_mark_prims((0.0, 0.0), 0.0, style="lines")
|
|
assert "radius" in str(excinfo.value)
|
|
with pytest.raises(ValueError) as excinfo:
|
|
centre_mark_prims((0.0, 0.0), 5.0, extension=0.0)
|
|
assert "extension" in str(excinfo.value)
|
|
|
|
|
|
# ── ISO 128-40 cutting-plane line ───────────────────────────────────────────
|
|
|
|
from engineering.mech.marks import ( # noqa: E402 - grouped with its own tests
|
|
SECTION_STYLES,
|
|
section_line_prims,
|
|
section_plane,
|
|
)
|
|
from engineering.mech.primitives import Poly, Text # noqa: E402
|
|
|
|
|
|
async def test_the_cutting_plane_line_is_thick_at_the_ends_and_thin_between():
|
|
prims = section_line_prims(
|
|
(0.0, 0.0), (100.0, 0.0), label="A", direction=(0.0, -1.0), height=5.0
|
|
)
|
|
head_end, tail_end, middle = prims[0], prims[1], prims[2]
|
|
assert head_end.p1 == pytest.approx((0.0, 0.0), abs=EPS)
|
|
assert head_end.p2 == pytest.approx((10.0, 0.0), abs=EPS)
|
|
assert head_end.role == "visible"
|
|
assert tail_end.p1 == pytest.approx((90.0, 0.0), abs=EPS)
|
|
assert tail_end.p2 == pytest.approx((100.0, 0.0), abs=EPS)
|
|
assert tail_end.role == "visible"
|
|
assert middle.p1 == pytest.approx((10.0, 0.0), abs=EPS)
|
|
assert middle.p2 == pytest.approx((90.0, 0.0), abs=EPS)
|
|
assert middle.role == "center"
|
|
|
|
|
|
async def test_a_short_cutting_plane_is_one_wide_segment_with_no_thin_middle():
|
|
prims = section_line_prims((0.0, 0.0), (15.0, 0.0), height=5.0)
|
|
assert prims[0].p1 == pytest.approx((0.0, 0.0), abs=EPS)
|
|
assert prims[0].p2 == pytest.approx((15.0, 0.0), abs=EPS)
|
|
assert prims[0].role == "visible"
|
|
assert not [p for p in prims if isinstance(p, Line) and p.role == "center"]
|
|
|
|
|
|
async def test_each_end_gets_an_arrow_pointing_the_viewing_direction_and_the_same_letter():
|
|
prims = section_line_prims(
|
|
(0.0, 0.0), (100.0, 0.0), label="B", direction=(0.0, -1.0), height=5.0
|
|
)
|
|
shafts = [p for p in prims if isinstance(p, Line) and p.p1[0] == p.p2[0]]
|
|
assert len(shafts) == 2
|
|
# The shaft comes from outside and the head's tip sits on the line end.
|
|
assert shafts[0].p1 == pytest.approx((0.0, 10.0), abs=EPS)
|
|
assert shafts[0].p2 == pytest.approx((0.0, 0.0), abs=EPS)
|
|
assert shafts[1].p1 == pytest.approx((100.0, 10.0), abs=EPS)
|
|
assert shafts[1].p2 == pytest.approx((100.0, 0.0), abs=EPS)
|
|
heads = [p for p in prims if isinstance(p, Poly)]
|
|
assert len(heads) == 2 and all(h.closed for h in heads)
|
|
assert _flat(heads[0].points) == pytest.approx((0.0, 0.0, 1.4, 4.0, -1.4, 4.0), abs=EPS)
|
|
labels = [p for p in prims if isinstance(p, Text)]
|
|
assert [t.text for t in labels] == ["B", "B"]
|
|
assert labels[0].at == pytest.approx((0.0, 13.5), abs=EPS)
|
|
assert labels[1].at == pytest.approx((100.0, 13.5), abs=EPS)
|
|
assert all(t.height == 5.0 and t.role == "text" for t in labels)
|
|
|
|
|
|
async def test_a_viewing_direction_parallel_to_the_plane_is_refused():
|
|
with pytest.raises(ValueError) as excinfo:
|
|
section_line_prims((0.0, 0.0), (100.0, 0.0), direction=(1.0, 0.0))
|
|
assert "perpendicular" in str(excinfo.value)
|
|
with pytest.raises(ValueError) as excinfo:
|
|
section_line_prims((0.0, 0.0), (0.0, 0.0), direction=(0.0, -1.0))
|
|
assert "distinct" in str(excinfo.value)
|
|
|
|
|
|
async def test_section_plane_is_exactly_the_dict_the_view_engine_consumes():
|
|
plane = section_plane((0.0, 0.0), (100.0, 0.0), label="A", direction=(0.0, -2.0))
|
|
assert plane == {
|
|
"p1": (0.0, 0.0),
|
|
"p2": (100.0, 0.0),
|
|
"label": "A",
|
|
"direction": (0.0, -1.0),
|
|
"style": "full",
|
|
}
|
|
assert list(plane) == ["p1", "p2", "label", "direction", "style"]
|
|
assert SECTION_STYLES == ("full", "half", "offset", "revolved")
|
|
with pytest.raises(ValueError) as excinfo:
|
|
section_plane((0.0, 0.0), (10.0, 0.0), style="broken")
|
|
assert "full, half, offset, revolved" in str(excinfo.value)
|
|
with pytest.raises(ValueError) as excinfo:
|
|
section_plane((0.0, 0.0), (10.0, 0.0), label="")
|
|
assert "label" in str(excinfo.value)
|
|
|
|
|
|
# ── the async layer ─────────────────────────────────────────────────────────
|
|
|
|
from engineering.mech.marks import ( # noqa: E402 - grouped with its own tests
|
|
draw_centre_marks,
|
|
draw_material_hatch,
|
|
draw_section_line,
|
|
)
|
|
from engineering.mech.primitives import ROLE_LAYER # noqa: E402
|
|
from engineering.mech.standards.materials import MATERIALS, hatch_for # noqa: E402
|
|
|
|
|
|
async def test_centre_marks_read_the_circles_real_radius_from_the_drawing(backend):
|
|
small = await backend.entity_create_circle(0.0, 0.0, 4.0, "GEOMETRY")
|
|
large = await backend.entity_create_circle(50.0, 0.0, 12.0, "GEOMETRY")
|
|
result = await draw_centre_marks(
|
|
backend, handles=[small.handle, large.handle], style="lines", extension=2.0
|
|
)
|
|
assert result["ok"] is True and result["count"] == 4
|
|
assert result["sources"] == [
|
|
{"handle": small.handle, "center": [0.0, 0.0], "radius": 4.0},
|
|
{"handle": large.handle, "center": [50.0, 0.0], "radius": 12.0},
|
|
]
|
|
first = await backend.entity_get(result["handles"][0])
|
|
assert first.layer == ROLE_LAYER["center"]
|
|
assert first.properties["start"] == pytest.approx([-6.0, 0.0], abs=EPS)
|
|
assert first.properties["end"] == pytest.approx([6.0, 0.0], abs=EPS)
|
|
third = await backend.entity_get(result["handles"][2])
|
|
assert third.properties["start"] == pytest.approx([36.0, 0.0], abs=EPS)
|
|
assert third.properties["end"] == pytest.approx([64.0, 0.0], abs=EPS)
|
|
|
|
|
|
async def test_centre_marks_refuse_a_handle_that_is_not_a_circular_feature(backend):
|
|
line = await backend.entity_create_line(0.0, 0.0, 10.0, 0.0, 0.0, 0.0, "GEOMETRY")
|
|
before = (await backend.analysis_stats())["total_entities"]
|
|
with pytest.raises(ValueError) as excinfo:
|
|
await draw_centre_marks(backend, handles=[line.handle])
|
|
assert line.handle in str(excinfo.value) and "LINE" in str(excinfo.value)
|
|
assert (await backend.analysis_stats())["total_entities"] == before
|
|
|
|
|
|
async def test_explicit_centres_are_accepted_and_lines_need_a_radius(backend):
|
|
result = await draw_centre_marks(backend, centers=[[5.0, 5.0]], style="mark", extension=3.0)
|
|
assert result["count"] == 2 and result["sources"] == [
|
|
{"handle": None, "center": [5.0, 5.0], "radius": None}
|
|
]
|
|
with pytest.raises(ValueError) as excinfo:
|
|
await draw_centre_marks(backend, centers=[[5.0, 5.0]], style="lines")
|
|
assert "centers[0]" in str(excinfo.value)
|
|
with pytest.raises(ValueError) as excinfo:
|
|
await draw_centre_marks(backend)
|
|
assert "handles" in str(excinfo.value) and "centers" in str(excinfo.value)
|
|
|
|
|
|
async def test_draw_section_line_returns_the_plane_dict_the_view_engine_consumes(backend):
|
|
result = await draw_section_line(
|
|
backend, (0.0, 0.0), (100.0, 0.0), label="A", direction=(0.0, -1.0), height=5.0
|
|
)
|
|
assert result["ok"] is True
|
|
assert result["plane"] == {
|
|
"p1": (0.0, 0.0),
|
|
"p2": (100.0, 0.0),
|
|
"label": "A",
|
|
"direction": (0.0, -1.0),
|
|
"style": "full",
|
|
}
|
|
assert list(result["plane"]) == ["p1", "p2", "label", "direction", "style"]
|
|
layers = set()
|
|
for handle in result["handles"]:
|
|
layers.add((await backend.entity_get(handle)).layer)
|
|
assert layers == {ROLE_LAYER["visible"], ROLE_LAYER["center"], ROLE_LAYER["text"]}
|
|
|
|
|
|
async def test_material_hatch_uses_the_iso_128_50_map_and_scales_on_top_of_it(backend):
|
|
steel = hatch_for("steel")
|
|
result = await draw_material_hatch(
|
|
backend,
|
|
boundary=[[0.0, 0.0], [40.0, 0.0], [40.0, 20.0], [0.0, 20.0]],
|
|
material="steel",
|
|
scale=2.0,
|
|
)
|
|
assert result["ok"] is True and result["material"] == "steel"
|
|
assert result["pattern"] == steel["pattern"]
|
|
assert result["scale"] == pytest.approx(steel["scale"] * 2.0, abs=EPS)
|
|
assert result["angle"] == pytest.approx(steel["angle"], abs=EPS)
|
|
hatch = backend._doc.entitydb.get(result["handle"])
|
|
assert hatch.dxftype() == "HATCH"
|
|
assert hatch.dxf.pattern_name == steel["pattern"]
|
|
assert hatch.dxf.pattern_scale == pytest.approx(steel["scale"] * 2.0, abs=EPS)
|
|
assert hatch.dxf.pattern_angle == pytest.approx(steel["angle"], abs=EPS)
|
|
assert (await backend.entity_get(result["handle"])).layer == ROLE_LAYER["hatch"]
|
|
# An explicit angle overrides the material's own.
|
|
turned = await draw_material_hatch(
|
|
backend,
|
|
boundary=[[0.0, 0.0], [10.0, 0.0], [10.0, 10.0]],
|
|
material="steel",
|
|
angle=90.0,
|
|
)
|
|
assert turned["angle"] == pytest.approx(90.0, abs=EPS)
|
|
|
|
|
|
async def test_an_unknown_material_is_refused_with_the_list_before_any_write(backend):
|
|
assert "steel" in MATERIALS
|
|
before = (await backend.analysis_stats())["total_entities"]
|
|
with pytest.raises(ValueError):
|
|
await draw_material_hatch(
|
|
backend,
|
|
boundary=[[0.0, 0.0], [10.0, 0.0], [10.0, 10.0]],
|
|
material="unobtainium",
|
|
)
|
|
assert (await backend.analysis_stats())["total_entities"] == before
|
|
|
|
|
|
async def test_a_boundary_that_is_not_a_closed_polygon_is_refused(backend):
|
|
with pytest.raises(ValueError) as excinfo:
|
|
await draw_material_hatch(backend, boundary=[[0.0, 0.0], [10.0, 0.0]], material="steel")
|
|
assert "at least three" in str(excinfo.value)
|
|
with pytest.raises(ValueError) as excinfo:
|
|
await draw_material_hatch(backend, material="steel")
|
|
assert "boundary" in str(excinfo.value) and "handles" in str(excinfo.value)
|
|
|
|
|
|
# ── the HATCH layer must exist before the hatch is created (live) ────────────
|
|
|
|
import types # noqa: E402
|
|
|
|
|
|
class _StrictLayerHatchBackend:
|
|
"""A backend that refuses a hatch on a layer the drawing does not have.
|
|
|
|
MEASURED on AutoCAD 2026 (probe: GetActiveObject, `Documents.Add()`, a
|
|
scratch document whose layer table is `['0']`, `doc.Close(False)` in a
|
|
`finally:`): `msp.AddHatch(0, "ANSI31", False)` + `AppendOuterLoop` +
|
|
`Evaluate()` leaves the AcDbHatch in model space, and the very next
|
|
statement `hatch.Layer = "HATCH"` raises
|
|
`com_error (-2147352567, ..., 'Key not found', ..., -2145386476)`. Model
|
|
space then still reports `[('AcDbHatch', '0')]` and the layer table is
|
|
still `['0']` - the refusal leaves an orphan hatch behind. After
|
|
`doc.Layers.Add("HATCH")` the same assignment succeeds. `ComBackend`
|
|
reaches that assignment through `_apply_entity_attrs`, which is the one
|
|
line `entity.Layer = layer`, so this is the hatch spelling of the failure
|
|
`ensure_annotation_layers` already fixed for the annotation symbols.
|
|
|
|
The fake models that measured refusal and nothing else: every member below
|
|
exists on the real `AutoCADBackend` with this signature.
|
|
"""
|
|
|
|
def __init__(self, layers=("0",)):
|
|
self.layers = {name.lower(): name for name in layers}
|
|
self.calls: list[tuple] = []
|
|
|
|
async def layer_list(self):
|
|
self.calls.append(("layer_list",))
|
|
return [types.SimpleNamespace(name=name) for name in self.layers.values()]
|
|
|
|
async def layer_create(self, name, color=7, linetype="Continuous", lineweight=-3):
|
|
self.calls.append(("layer_create", name, color, linetype, lineweight))
|
|
self.layers[name.lower()] = name
|
|
return types.SimpleNamespace(name=name)
|
|
|
|
async def entity_create_hatch(
|
|
self, pattern, boundary_points, scale=1.0, angle=0.0, layer=None, color=None
|
|
):
|
|
if layer is not None and layer.lower() not in self.layers:
|
|
raise RuntimeError(f"AutoCAD COM error (-0x7ffdfff7) ('Key not found'): {layer}")
|
|
self.calls.append(("HATCH", layer, pattern))
|
|
return types.SimpleNamespace(handle="2F")
|
|
|
|
|
|
async def test_the_hatch_layer_is_created_before_the_hatch_is():
|
|
backend = _StrictLayerHatchBackend()
|
|
result = await draw_material_hatch(
|
|
backend,
|
|
boundary=[[0.0, 0.0], [40.0, 0.0], [40.0, 20.0], [0.0, 20.0]],
|
|
material="steel",
|
|
)
|
|
assert result["ok"] is True and result["handle"] == "2F"
|
|
assert result["layers_created"] == [ROLE_LAYER["hatch"]]
|
|
# The layer is created strictly before the hatch entity.
|
|
kinds = [call[0] for call in backend.calls]
|
|
assert kinds.index("layer_create") < kinds.index("HATCH")
|
|
# ENGINEERING_LAYERS' own definition, not a bare default.
|
|
create = next(c for c in backend.calls if c[0] == "layer_create")
|
|
assert create[1] == ROLE_LAYER["hatch"]
|
|
|
|
|
|
async def test_a_drawing_that_already_has_the_hatch_layer_is_not_rewritten():
|
|
backend = _StrictLayerHatchBackend(layers=("0", "hatch"))
|
|
result = await draw_material_hatch(
|
|
backend, boundary=[[0.0, 0.0], [10.0, 0.0], [10.0, 10.0]], material="steel"
|
|
)
|
|
assert result["layers_created"] == []
|
|
assert not [c for c in backend.calls if c[0] == "layer_create"]
|
|
|
|
|
|
# ── the cut face is the face, not its chords (regression) ───────────────────
|
|
|
|
from engineering.layers import ENGINEERING_LAYERS # noqa: E402
|
|
from engineering.mech import marks as _marks # noqa: E402
|
|
from engineering.mech.marks import ( # noqa: E402
|
|
HATCH_FLATTEN_SAGITTA,
|
|
_flatten_bulge,
|
|
_polygon_area,
|
|
)
|
|
|
|
|
|
async def test_a_bulged_segment_is_expanded_onto_its_real_arc():
|
|
"""A bulge of 1 is a 180 degree arc; its chords must sit on that circle."""
|
|
interior = _flatten_bulge((40.0, 10.0), (0.0, 10.0), 1.0)
|
|
assert len(interior) >= 40 # a 0.01 sagitta on r=20 needs ~50 chords
|
|
for x, y in interior:
|
|
assert math.hypot(x - 20.0, y - 10.0) == pytest.approx(20.0, abs=1e-9)
|
|
assert y >= 10.0 # a positive bulge sweeps counter-clockwise, i.e. above
|
|
# Every chord's sagitta stays inside the declared tolerance.
|
|
walk = [(40.0, 10.0), *interior, (0.0, 10.0)]
|
|
for (x1, y1), (x2, y2) in zip(walk, walk[1:], strict=False):
|
|
chord = math.hypot(x2 - x1, y2 - y1)
|
|
sagitta = 20.0 - math.sqrt(max(0.0, 400.0 - (chord / 2.0) ** 2))
|
|
assert sagitta <= HATCH_FLATTEN_SAGITTA + 1e-12
|
|
assert _flatten_bulge((0.0, 0.0), (10.0, 0.0), 0.0) == []
|
|
|
|
|
|
async def _arc_topped_face(backend):
|
|
"""A 40x10 box closed by a 180 degree arc: 400 straight + 628.3 under the arc."""
|
|
lower = await backend.entity_create_line(0.0, 0.0, 40.0, 0.0, 0.0, 0.0, "GEOMETRY")
|
|
right = await backend.entity_create_line(40.0, 0.0, 40.0, 10.0, 0.0, 0.0, "GEOMETRY")
|
|
arc = await backend.entity_create_arc(20.0, 10.0, 20.0, 0.0, 180.0, "GEOMETRY")
|
|
left = await backend.entity_create_line(0.0, 10.0, 0.0, 0.0, 0.0, 0.0, "GEOMETRY")
|
|
return [lower.handle, right.handle, arc.handle, left.handle]
|
|
|
|
|
|
async def _rectangle(backend):
|
|
handles = []
|
|
for start, end in (
|
|
((0.0, 0.0), (40.0, 0.0)),
|
|
((40.0, 0.0), (40.0, 10.0)),
|
|
((40.0, 10.0), (0.0, 10.0)),
|
|
((0.0, 10.0), (0.0, 0.0)),
|
|
):
|
|
line = await backend.entity_create_line(start[0], start[1], end[0], end[1], 0.0, 0.0)
|
|
handles.append(line.handle)
|
|
return handles
|
|
|
|
|
|
async def test_an_arc_bounded_cut_face_is_hatched_on_the_arc_not_its_chord(backend):
|
|
"""The failure README.md names: reading `points` drops the parallel `bulges`.
|
|
|
|
Reading only `traced.properties["points"]` hatched the chord polygon -
|
|
400.0 of a 1028.3 cut face, 61% of it silently unhatched. The hatch must
|
|
now measure the face, and the payload must state its own accuracy.
|
|
"""
|
|
handles = await _arc_topped_face(backend)
|
|
exact = (await backend.boundary_from_entities(handles))["area"]
|
|
assert exact == pytest.approx(400.0 + 200.0 * math.pi, abs=1e-6)
|
|
|
|
result = await draw_material_hatch(backend, handles=handles, material="steel")
|
|
assert result["ok"] is True
|
|
assert result["curved_edges"] == 1
|
|
assert result["points"] > 4 # not the four-vertex chord polygon
|
|
assert result["boundary_area"] == pytest.approx(exact, abs=1e-6)
|
|
# Inside the declared flattening tolerance of the real face, not 61% short.
|
|
assert result["area"] == pytest.approx(exact, rel=1e-3)
|
|
assert result["accuracy"] == "flatten_tolerance"
|
|
assert result["flatten_tolerance"] == HATCH_FLATTEN_SAGITTA
|
|
# What the drawing holds agrees with what the payload claims.
|
|
measured = await backend.entity_measure(result["handle"])
|
|
assert measured["area"] == pytest.approx(result["area"], abs=1e-6)
|
|
|
|
|
|
async def test_a_straight_sided_face_is_still_reported_exact(backend):
|
|
handles = await _rectangle(backend)
|
|
result = await draw_material_hatch(backend, handles=handles, material="steel")
|
|
assert result["accuracy"] == "exact"
|
|
assert result["flatten_tolerance"] is None
|
|
assert result["curved_edges"] == 0
|
|
assert result["area"] == pytest.approx(400.0, abs=EPS)
|
|
assert result["boundary_area"] == pytest.approx(400.0, abs=EPS)
|
|
assert result["points"] == 4
|
|
|
|
|
|
async def test_the_traced_outline_is_removed_and_reported_not_left_on_layer_0(backend):
|
|
"""`boundary_from_entities` *draws* its loop; hatch_material asked for a hatch."""
|
|
handles = await _rectangle(backend)
|
|
before = await backend.analysis_stats()
|
|
result = await draw_material_hatch(backend, handles=handles, material="steel")
|
|
after = await backend.analysis_stats()
|
|
# Exactly one new entity: the hatch. No LWPOLYLINE scaffolding survives.
|
|
assert after["total_entities"] == before["total_entities"] + 1
|
|
assert after["by_type"].get("LWPOLYLINE", 0) == 0
|
|
assert result["traced"]["removed"] is True
|
|
assert result["traced"]["handle"]
|
|
live = {entity.dxf.handle for entity in backend._doc.modelspace()}
|
|
assert result["traced"]["handle"] not in live
|
|
|
|
|
|
async def test_a_loop_that_encloses_no_area_is_refused_and_leaves_nothing_behind(backend):
|
|
"""Three collinear segments chain into a closed loop of area 0.0.
|
|
|
|
The handles branch had no such guard - the 'at least three points' refusal
|
|
only ever covered `boundary` - so it wrote a HATCH of area 0.0 and returned
|
|
ok. The traced outline must still be cleaned up on the refusal path.
|
|
"""
|
|
handles = []
|
|
for start, end in (
|
|
((0.0, 0.0), (10.0, 0.0)),
|
|
((10.0, 0.0), (20.0, 0.0)),
|
|
((20.0, 0.0), (0.0, 0.0)),
|
|
):
|
|
line = await backend.entity_create_line(start[0], start[1], end[0], end[1], 0.0, 0.0)
|
|
handles.append(line.handle)
|
|
before = await backend.analysis_stats()
|
|
with pytest.raises(ValueError) as excinfo:
|
|
await draw_material_hatch(backend, handles=handles, material="steel")
|
|
assert "no area" in str(excinfo.value)
|
|
after = await backend.analysis_stats()
|
|
assert after["total_entities"] == before["total_entities"]
|
|
assert after["by_type"].get("LWPOLYLINE", 0) == 0
|
|
assert after["by_type"].get("HATCH", 0) == 0
|
|
|
|
|
|
async def test_the_polygon_area_helper_is_orientation_blind():
|
|
square = [(0.0, 0.0), (10.0, 0.0), (10.0, 10.0), (0.0, 10.0)]
|
|
assert _polygon_area(square) == pytest.approx(100.0, abs=EPS)
|
|
assert _polygon_area(list(reversed(square))) == pytest.approx(100.0, abs=EPS)
|
|
|
|
|
|
# ── the SOURCE block may not quote a lineweight the layer set does not have ──
|
|
|
|
|
|
async def test_the_section_line_source_block_quotes_the_layer_set_it_draws_on():
|
|
"""A SOURCE block asserting 0.25 mm while CENTER is 0.18 mm is a fabricated
|
|
number in the one place this repository refuses to fabricate one."""
|
|
widths = {name: weight for name, _c, _lt, weight, _d in ENGINEERING_LAYERS}
|
|
wide, narrow = widths["GEOMETRY"], widths["CENTER"]
|
|
doc = _marks.__doc__
|
|
assert f"GEOMETRY is {wide:.2f} mm" in doc
|
|
assert f"CENTER is {narrow:.2f} mm" in doc
|
|
assert f"{wide / narrow:.2f}:1" in doc
|
|
|
|
|
|
async def test_the_cutting_plane_line_really_lands_on_those_two_lineweights(backend):
|
|
result = await draw_section_line(
|
|
backend, (0.0, 0.0), (100.0, 0.0), label="A", direction=(0.0, -1.0), height=5.0
|
|
)
|
|
widths = {layer.name: layer.lineweight for layer in await backend.layer_list()}
|
|
drawn = {(await backend.entity_get(handle)).layer for handle in result["handles"]}
|
|
assert {ROLE_LAYER["visible"], ROLE_LAYER["center"]} <= drawn
|
|
# lineweight is reported in 1/100 mm; the SOURCE block quotes millimetres.
|
|
assert widths[ROLE_LAYER["visible"]] == pytest.approx(50.0, abs=EPS)
|
|
assert widths[ROLE_LAYER["center"]] == pytest.approx(18.0, abs=EPS)
|