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
9 changes: 5 additions & 4 deletions docs/reference/sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,13 @@ 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
For a declared step or boss diameter, `side=` can instead select a bounded leader hemisphere:
`above`/`below` for an X-axis feature, `left`/`right` for a Z-axis feature, and all four
for a Y-axis end-on feature. 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;
Dimension-side overrides currently cover native hole/pattern callouts, step/boss diameter
leaders, and envelope height;
unsupported renderers are not advertised as movable. The side surface accepts `above`,
`below`, `left`, and `right` where the selected renderer supports them;
`validate_layout_override()` returns
Expand Down
13 changes: 7 additions & 6 deletions src/draftwright/model/planner.py
Original file line number Diff line number Diff line change
Expand Up @@ -1819,20 +1819,21 @@ def _check_intent_policy_conflicts(model: PartModel) -> None:

def _validate_compound_callout_side(feature, approved, selected_view, requested_side) -> None:
"""Check a compound callout's requested corridor against its renderer."""
if feature.kind == "step":
step_sides = {
if feature.kind in {"step", "boss"}:
diameter_sides = {
"x": {"above", "below"},
"y": {"above", "below", "left", "right"},
"z": {"left", "right"},
}.get(feature.frame.axis, set())
diameter_parameter = "step.diameter" if feature.kind == "step" else "boss.diameter"
if (
all(pd.side is None or pd.param.parameter_id == "step.diameter" for pd in approved)
and requested_side in step_sides
all(pd.side is None or pd.param.parameter_id == diameter_parameter for pd in approved)
and requested_side in diameter_sides
):
return
raise ValueError(
"step diameter side is available only for its front-view OD leader; "
f"supported sides: {sorted(step_sides) or 'none'}"
f"{feature.kind} diameter side is available only for its front-view OD leader; "
f"supported sides: {sorted(diameter_sides) or 'none'}"
)
supported = {
"plan": {"left", "right"},
Expand Down
2 changes: 1 addition & 1 deletion src/draftwright/sheet_layout_controls.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def layout_options(
}
# Only advertise sides whose renderer consumes the authored corridor. Other
# planner-accepted sides are not an editor actuator until that renderer uses them.
if feature.kind in {"hole", "pattern", "envelope", "step"}:
if feature.kind in {"hole", "pattern", "envelope", "step", "boss"}:
placements = sheet.dimension_options(handle, parameter)["placements"]
sides = sorted(
{
Expand Down
39 changes: 39 additions & 0 deletions tests/test_layout_override_lane_issue_1757.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,45 @@ def test_step_length_does_not_advertise_diameter_callout_side() -> None:
assert result["supported"] is False


@pytest.mark.parametrize(
("axis", "rotation", "sides", "coordinate"),
[
("x", (0, 90, 0), ("above", "below"), 1),
("y", (90, 0, 0), ("left", "right"), 0),
("z", (0, 0, 0), ("left", "right"), 0),
],
)
def test_boss_diameter_side_override_uses_requested_hemisphere(
axis, rotation, sides, coordinate
) -> None:
observed = []
for side in sides:
sheet = Sheet(Rot(*rotation) * Cylinder(15, 40), page="A3", scale=2).authored_dimensions()
boss = sheet.boss(diameter=30, height=40, at=(0, 0, 0), axis=axis)
boss.identify("declaration:boss")
sheet.dimension(boss, "boss.diameter")
options = sheet.layout_options("declaration:boss", parameter="boss.diameter")
assert side in options["controls"]["side"]["supported_values"]
sheet.layout_override("declaration:boss", parameter="boss.diameter", side=side)
drawing = sheet.build()
mark = drawing.get_annotation(f"m_dia_{axis}0")
assert mark is not None
assert not any(issue.code == "placement_unsatisfiable" for issue in drawing.lint())
observed.append(mark.elbow[coordinate] - mark.tip[coordinate])
assert observed[0] * observed[1] < 0


def test_boss_height_does_not_advertise_diameter_callout_side() -> None:
sheet = Sheet(Cylinder(15, 40)).authored_dimensions()
boss = sheet.boss(diameter=30, height=40, at=(0, 0, 0), axis="z")
boss.identify("declaration:boss")
sheet.dimension(boss, "boss_height.length")
result = sheet.validate_layout_override(
"declaration:boss", parameter="boss_height.length", side="right"
)
assert result["supported"] is False


def test_lane_override_changes_only_the_exact_dimension_policy() -> None:
sheet = _slot_sheet()
sheet.layout_override("declaration:slot", parameter="slot_width.length", lane=4)
Expand Down
Loading