* claim: #4030 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Sketch Symmetry: a dimensioned shape slides onto the axis (#4030) With a rectangle's width dimensioned, Symmetry of its two sides about an axis was refused: the second side can't move on its own, the axis never moves, and the ordinary solve that slides the whole rectangle only ran when every first-picked entity could move. One movable first entity is now enough. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1533,7 +1533,6 @@ fn keep_size(sk: &Sketch, e: Ent) -> Vec<ConstraintKind> {
|
||||
/// if neither can, the constraint conflicts and nothing changes. Everything else moves as
|
||||
/// little as it can. Later solves are ordinary ones (nothing is held).
|
||||
pub(super) fn apply_in_order(sk: &mut Sketch, rep: &SolveReport, first: &[Ent], second: Ent, cmd: &str) -> Result<()> {
|
||||
let first_locked = first.iter().any(|e| ent_locked(sk, rep, *e));
|
||||
let second_locked = ent_locked(sk, rep, second);
|
||||
// (held geometry, temporary size constraints) to try in turn.
|
||||
let mut tries: Vec<(Hold, Vec<ConstraintKind>)> = Vec::new();
|
||||
@@ -1576,8 +1575,11 @@ pub(super) fn apply_in_order(sk: &mut Sketch, rep: &SolveReport, first: &[Ent],
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
// Both could move but holding either one leads nowhere: solve as usual.
|
||||
if !first_locked && !second_locked {
|
||||
// Both could move but holding either one leads nowhere: solve as usual. One movable first
|
||||
// entity is enough: a symmetry's axis never moves, and with a width fixed between the mirrored
|
||||
// sides neither side moves alone, but the two together slide onto the axis (#4030).
|
||||
let first_movable = first.iter().any(|f| !ent_locked(sk, rep, *f));
|
||||
if first_movable && !second_locked {
|
||||
let mut trial = sk.clone();
|
||||
if solve_with(&mut trial, &Hold::default(), None, Analysis::StatusOnly, None).ok() {
|
||||
*sk = trial;
|
||||
|
||||
@@ -413,13 +413,13 @@ fn rectangle_and_axis(dimension_left: bool) -> (Session, Vec<String>) {
|
||||
(s, sides)
|
||||
}
|
||||
|
||||
/// Both sides keep their 10 mm height and their ends mirror in x about `axis_x`.
|
||||
fn assert_sides_mirror_with_height(s: &Session, left: &str, right: &str, axis_x: f64) {
|
||||
/// Both sides keep their `height` and their ends mirror in x about `axis_x`.
|
||||
fn assert_sides_mirror_with_height(s: &Session, left: &str, right: &str, axis_x: f64, height: f64) {
|
||||
let sk = sketch(s);
|
||||
let at = |r: String| sk.point(sk.resolve_point(&r).unwrap()).unwrap();
|
||||
for side in [left, right] {
|
||||
let (a, b) = (at(format!("{side}.start")), at(format!("{side}.end")));
|
||||
assert!((a.y - b.y).abs() > 9.999 && (a.y - b.y).abs() < 10.001, "{side} height {:?} {:?}", a, b);
|
||||
assert!(((a.y - b.y).abs() - height).abs() < 1e-3, "{side} height {:?} {:?}", a, b);
|
||||
assert!((a.x - b.x).abs() < 1e-7, "{side} not vertical: {:?} {:?}", a, b);
|
||||
}
|
||||
let (l, r) = (at(format!("{left}.start")), at(format!("{right}.start")));
|
||||
@@ -432,7 +432,7 @@ fn symmetry_of_rectangle_sides_keeps_their_height() {
|
||||
// by index forced both heights to 0.
|
||||
let (mut s, sides) = rectangle_and_axis(false);
|
||||
run(&mut s, "sketch.constraint.symmetry", json!({"a": sides[3], "b": sides[1], "line": "axis"}));
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], -20.0);
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], -20.0, 10.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -440,14 +440,14 @@ fn symmetry_of_a_dimensioned_rectangle_side_is_accepted() {
|
||||
// #2961: with a length on a side, the same symmetry was refused as "neither entity can move".
|
||||
let (mut s, sides) = rectangle_and_axis(true);
|
||||
run(&mut s, "sketch.constraint.symmetry", json!({"a": sides[3], "b": sides[1], "line": "axis"}));
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], -20.0);
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], -20.0, 10.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symmetry_of_rectangle_sides_with_swapped_arguments() {
|
||||
let (mut s, sides) = rectangle_and_axis(true);
|
||||
run(&mut s, "sketch.constraint.symmetry", json!({"a": sides[1], "b": sides[3], "line": "axis"}));
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], -20.0);
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], -20.0, 10.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -457,7 +457,24 @@ fn symmetry_of_rectangle_sides_about_the_y_axis() {
|
||||
let sides = ids(&r["curves"]);
|
||||
run(&mut s, "sketch.dimension", json!({"entities": [sides[3].clone()], "value": 10}));
|
||||
run(&mut s, "sketch.constraint.symmetry", json!({"a": sides[3], "b": sides[1], "line": "y"}));
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], 0.0);
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], 0.0, 10.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symmetry_slides_a_rectangle_whose_width_is_dimensioned() {
|
||||
// #4030: with the width fixed, the second side can't move on its own and the axis never
|
||||
// moves, so the symmetry was refused as "neither entity can move". The whole rectangle slides
|
||||
// sideways instead, keeping its 42 mm width.
|
||||
let mut s = new_sketch();
|
||||
let r = run(&mut s, "sketch.rectangle.two_point", json!({"p0": [-19, -16], "p1": [23, 10], "construction": true}));
|
||||
let sides = ids(&r["curves"]);
|
||||
run(&mut s, "sketch.dimension", json!({"entities": [sides[0].clone()], "value": 42}));
|
||||
run(&mut s, "sketch.constraint.symmetry", json!({"a": sides[3], "b": sides[1], "line": "y"}));
|
||||
assert_sides_mirror_with_height(&s, &sides[3], &sides[1], 0.0, 26.0);
|
||||
let sk = sketch(&s);
|
||||
let at = |r: String| sk.point(sk.resolve_point(&r).unwrap()).unwrap();
|
||||
let (l, r) = (at(format!("{}.start", sides[3])), at(format!("{}.start", sides[1])));
|
||||
assert!((r.x - l.x - 42.0).abs() < 1e-6 && (l.x + 21.0).abs() < 1e-6, "sides at ±21: {l:?} {r:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user