Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/reference/sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@ overall OD diameter of a rotational feature, and step diameter leaders.
Capability is
declared in one compiler-owned registry so another dimension family is added deliberately, not
by teaching each renderer a private spelling.
For a declared step diameter, `side=` can instead select a bounded leader hemisphere:
`above`/`below` for an X-axis step, `left`/`right` for a Z-axis step, and all four
for a Y-axis end-on step. The solve may report the requested side unplaceable; it
does not silently switch sides.

Dimension-side overrides currently cover native hole/pattern callouts and envelope height;
unsupported renderers are not advertised as movable. The side surface accepts `above`,
Expand Down
92 changes: 73 additions & 19 deletions src/draftwright/annotations/_diameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,24 @@ def _diameter_bucket_lane(entry) -> int | None:
return next(iter(lanes)) if len(lanes) == 1 else None


def _render_diameter_lanes(
def _diameter_bucket_side(entry) -> str | None:
"""Keep the one planner-approved side of a physical diameter bucket."""
sides = {
dim.side
for group in entry[6]
for dim in group.dims
if dim.kind == "diameter" and dim.side is not None
}
if len(sides) > 1:
raise ValueError("one physical diameter cannot have conflicting requested sides")
return next(iter(sides)) if len(sides) == 1 else None


def _diameter_has_placement_control(entry) -> bool:
return _diameter_bucket_lane(entry) is not None or _diameter_bucket_side(entry) is not None


def _render_diameter_controls(
dwg,
a,
indexed_buckets,
Expand All @@ -563,27 +580,32 @@ def _render_diameter_lanes(
place_jobs,
leader_reach,
) -> int:
"""Offer only the requested witness-relative rank to the shared leader solve."""
"""Offer only requested side/rank candidates to the shared leader solve."""
vb = dwg.view_bounds("front")
if vb is None:
return 0
spacing = dwg.draft.font_size + 2 * dwg.draft.pad_around_text
jobs = []
names = set()
requested_lanes = {}
requested_sides = {}
covers_diameters_by_name = {}
source_ids_by_name = {}
include_source_pmi = not ctx.document_member or a.pmi_mode == "annotate"
for index, entry in indexed_buckets:
_anchor, dia, value_text, refs, tolerance, rider, groups = entry
lane = _diameter_bucket_lane(entry)
if lane is None:
side = _diameter_bucket_side(entry)
if lane is None and side is None:
continue
representative = groups[0].facts
owner = next(iter(refs)) if len(refs) == 1 else None
name = f"{prefix}{start + index}"
names.add(name)
requested_lanes[name] = lane
if lane is not None:
requested_lanes[name] = lane
if side is not None:
requested_sides[name] = side
source_ids_by_name[name] = (
tuple(
dict.fromkeys(
Expand All @@ -598,27 +620,52 @@ def _render_diameter_lanes(
)
if axis == "y":
covers_diameters_by_name[name] = dia
reach = leader_reach(dwg.draft) + (lane - 1) * spacing
reach = (
leader_reach(dwg.draft) + (lane - 1) * spacing
if lane is not None
else dwg.draft.font_size + 2 * dwg.draft.pad_around_text
)
if axis == "y":
directions = _END_DIAMETER_LEAD_DIRS
if side is not None:
coordinate, sign = {
"left": (0, -1),
"right": (0, 1),
"below": (1, -1),
"above": (1, 1),
}[side]
directions = tuple(
direction for direction in directions if direction[coordinate] * sign > 1e-9
)
candidates = radial_candidates(
dwg,
"front",
vb,
representative,
reach,
rim=dia / 2 * a.SCALE,
directions=_END_DIAMETER_LEAD_DIRS,
directions=directions,
provenance=owner,
)
else:
directions = _DIAMETER_LEAD_DIRS[axis]
if side is not None:
directions = (
{
"above": (0, 1),
"below": (0, -1),
"left": (-1, 0),
"right": (1, 0),
}[side],
)
candidates = radial_candidates(
dwg,
"front",
vb,
representative,
reach,
source_bounds=_diameter_source_bounds(dwg, "front", representative, dia),
directions=_DIAMETER_LEAD_DIRS[axis],
directions=directions,
provenance=owner,
)
label = f"ø{value_text}{_tol_suffix(tolerance, dwg.draft)}"
Expand All @@ -639,14 +686,15 @@ def _render_diameter_lanes(
dwg,
a,
jobs,
noun="diameter at requested lane",
noun="diameter at requested side/lane",
drop_code="diameter_dropped",
ctx=ctx,
geom_clear=True,
joint=True,
expand_lanes=False,
straight_only_names=frozenset(names),
requested_lanes=requested_lanes,
requested_sides=requested_sides,
covers_diameters_by_name=covers_diameters_by_name,
source_ids_by_name=source_ids_by_name,
),
Expand Down Expand Up @@ -731,16 +779,18 @@ def typed(entry):
for group in entry[6]
)

lane_entries = [(index, entry) for index, entry in indexed if _diameter_bucket_lane(entry)]
controlled_entries = [
(index, entry) for index, entry in indexed if _diameter_has_placement_control(entry)
]
typed_entries = [
(index, entry)
for index, entry in indexed
if not _diameter_bucket_lane(entry) and typed(entry)
if not _diameter_has_placement_control(entry) and typed(entry)
]
plain_entries = [
(index, entry)
for index, entry in indexed
if not _diameter_bucket_lane(entry) and not typed(entry)
if not _diameter_has_placement_control(entry) and not typed(entry)
]
placed = 0
# A requested lane splits the otherwise unchanged contiguous legacy row.
Expand Down Expand Up @@ -785,10 +835,10 @@ def typed(entry):
place_jobs=place_jobs,
leader_reach=leader_reach,
)
placed += _render_diameter_lanes(
placed += _render_diameter_controls(
dwg,
a,
lane_entries,
controlled_entries,
axis="x",
prefix="m_dia_x",
start=start,
Expand Down Expand Up @@ -817,7 +867,11 @@ def _render_z_diameter_buckets(
indexed = list(enumerate(buckets.values()))
placed = 0
for _, run in groupby(
enumerate((index, entry) for index, entry in indexed if not _diameter_bucket_lane(entry)),
enumerate(
(index, entry)
for index, entry in indexed
if not _diameter_has_placement_control(entry)
),
key=lambda item: item[1][0] - item[0],
):
entries = [entry for _ordinal, entry in run]
Expand All @@ -829,10 +883,10 @@ def _render_z_diameter_buckets(
ctx=ctx,
place_what_fits=place_what_fits,
)
placed += _render_diameter_lanes(
placed += _render_diameter_controls(
dwg,
a,
[(index, entry) for index, entry in indexed if _diameter_bucket_lane(entry)],
[(index, entry) for index, entry in indexed if _diameter_has_placement_control(entry)],
axis="z",
prefix="m_dia_z",
start=start,
Expand Down Expand Up @@ -972,7 +1026,7 @@ def _next_start(prefix):
jobs = []
covered_by_name = {}
for i, entry in enumerate(end_buckets.values()):
if _diameter_bucket_lane(entry):
if _diameter_has_placement_control(entry):
continue
_anchor, dia, value_text, refs, dtol, thr, feature_groups = entry
representative = feature_groups[0].facts
Expand Down Expand Up @@ -1024,13 +1078,13 @@ def _next_start(prefix):
ann = ctx.registry.named(name)
if ann is not None:
ann.covers_diameters = (dia,)
placed += _render_diameter_lanes(
placed += _render_diameter_controls(
dwg,
a,
[
(index, entry)
for index, entry in enumerate(end_buckets.values())
if _diameter_bucket_lane(entry)
if _diameter_has_placement_control(entry)
],
axis="y",
prefix="m_dia_y",
Expand Down
45 changes: 35 additions & 10 deletions src/draftwright/annotations/_machined_leaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,34 +59,49 @@ class _MachinedJobContext:
source_ids_by_name: dict
source_drop_severity: str
requested_lanes: dict[str, int]
requested_sides: dict[str, str]
covers_diameters_by_name: dict[str, float]
straight_only_names: frozenset
late_inventory: bool
interior_clearance_by_view: dict
cross_view_clearance: bool
foreign_boxes_by_view: dict

def needs_drop_callback(self, source_ids, requested_lane) -> bool:
def needs_drop_callback(self, source_ids, requested_lane, requested_side) -> bool:
return (
requested_lane is not None or bool(source_ids) or self.source_drop_severity == "source"
requested_lane is not None
or requested_side is not None
or bool(source_ids)
or self.source_drop_severity == "source"
)

def attach_diameter_coverage(self, name, leader) -> None:
if name in self.covers_diameters_by_name:
leader.covers_diameters = (self.covers_diameters_by_name[name],)

def record_drop(self, label, measurement, source_ids, requested_lane, reason) -> None:
"""Report an explicit lane refusal or the ordinary source-aware drop."""
def record_drop(
self, label, measurement, source_ids, requested_lane, requested_side, reason
) -> None:
"""Report an explicit side/lane refusal or the ordinary source-aware drop."""
validation = reason == "geometry_validation"
detail = "rendered geometry validation failed" if validation else "no clear room"
if requested_lane is not None:
if requested_lane is not None or requested_side is not None:
target = (
f"requested lane {requested_lane}"
if requested_lane is not None
else f"requested side {requested_side}"
)
evidence = (
f"requested_lane_unavailable:{requested_lane}:{reason}"
if requested_lane is not None
else f"requested_side_unavailable:{requested_side}:{reason}"
)
self.ctx.record_issue(
"error",
"placement_unsatisfiable",
f"{self.noun} callout {label} not placed "
f"(requested lane {requested_lane} unavailable: {detail})",
f"{self.noun} callout {label} not placed ({target} unavailable: {detail})",
measurement=measurement,
evidence_reason=f"requested_lane_unavailable:{requested_lane}:{reason}",
evidence_reason=evidence,
outcome_stage="validation" if validation else "placement",
)
return
Expand Down Expand Up @@ -225,9 +240,12 @@ def compact_candidates(anchors, policy):

source_ids = tuple(self.source_ids_by_name.get(name, ()))
requested_lane = self.requested_lanes.get(name)
requested_side = self.requested_sides.get(name)

def on_drop(reason):
self.record_drop(label, measurement, source_ids, requested_lane, reason)
self.record_drop(
label, measurement, source_ids, requested_lane, requested_side, reason
)

if self.late_inventory:
candidates = (
Expand Down Expand Up @@ -289,7 +307,11 @@ def clear_foreign_label(box):
interior_label_clear=interior_label_clear,
foreign_label_clear=clear_foreign_label if self.cross_view_clearance else None,
allow_policy_b_fixed=True,
on_drop=on_drop if self.needs_drop_callback(source_ids, requested_lane) else None,
on_drop=(
on_drop
if self.needs_drop_callback(source_ids, requested_lane, requested_side)
else None
),
recover=None if straight_only else recover,
)

Expand Down Expand Up @@ -421,6 +443,7 @@ def place_machined_leader_jobs(
source_ids_by_name=None,
source_drop_severity="warning",
requested_lanes=None,
requested_sides=None,
covers_diameters_by_name=None,
priority=0.0,
straight_only_names=frozenset(),
Expand All @@ -430,6 +453,7 @@ def place_machined_leader_jobs(
"""Lower machined callouts into the shared immediate or late leader solve."""
source_ids_by_name = source_ids_by_name or {}
requested_lanes = requested_lanes or {}
requested_sides = requested_sides or {}
covers_diameters_by_name = covers_diameters_by_name or {}
family_region_policy = LeaderRegionPolicy(region_policy)
late_inventory = joint and getattr(ctx, "feature_leaders", None) is not None
Expand All @@ -447,6 +471,7 @@ def place_machined_leader_jobs(
source_ids_by_name=source_ids_by_name,
source_drop_severity=source_drop_severity,
requested_lanes=requested_lanes,
requested_sides=requested_sides,
covers_diameters_by_name=covers_diameters_by_name,
straight_only_names=straight_only_names,
late_inventory=late_inventory,
Expand Down
2 changes: 2 additions & 0 deletions src/draftwright/annotations/from_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ def place_machined_leader_jobs(
source_ids_by_name=None,
source_drop_severity="warning",
requested_lanes=None,
requested_sides=None,
covers_diameters_by_name=None,
priority=0.0,
straight_only_names=frozenset(),
Expand All @@ -693,6 +694,7 @@ def place_machined_leader_jobs(
source_ids_by_name=source_ids_by_name,
source_drop_severity=source_drop_severity,
requested_lanes=requested_lanes,
requested_sides=requested_sides,
covers_diameters_by_name=covers_diameters_by_name,
priority=priority,
straight_only_names=straight_only_names,
Expand Down
Loading
Loading