Files
cadcraft/crates/engine/tests/snap_overrides.rs
Valentin KleinandClaude Opus 5.5 242a00923d Object snap overrides at point prompts, Shift/Ctrl+right-click snap menu, Tab cycling (fixes #393) (#409)
Typed END, MID, CEN, GCEN, NOD, QUA, INT, APP, EXT, INS, PER, TAN, NEA,
PAR (any start of the word from three letters, with `_`/`'` prefixes)
and NON push a one-pick snap frame on the point-modifier layer: the
prompt reads "Endpoint of:", a typed point is snapped with that mode
alone within the aperture (or rejected with "No Endpoint found for
specified point."), and the canvas snaps the cursor with it
(Session::snap_override). A command's own keyword still wins (ARC/ZOOM
`cen`); `_cen` always snaps. Overrides nest with FROM and the filters.

Shift+right-click or Ctrl+right-click on the canvas opens the object
snap menu (From, Mid Between 2 Points, Point Filters, the snap modes,
None, Osnap Settings...), whose items type the same overrides. Tab over
a snap marker with nothing typed cycles the candidate snaps
(pointmod::snap_candidates: the running snap first, then the closest of
each mode).

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-10 18:44:21 -04:00

119 lines
4.6 KiB
Rust
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
//! Object snap overrides typed at a point prompt (#393): `END`, `MID`, `CEN`, `PER` … apply to the
//! next point only, `NON` turns snapping off for it, and they nest with FROM.
use cadcraft_doc::EntityKind;
use cadcraft_engine::pointmod::snap_candidates;
use cadcraft_engine::snap::{self, mode};
use cadcraft_engine::{Input, Session};
use cadcraft_geom::Vec2;
/// A session with a line 0,0–10,0, a line 10,0–10,10 and a circle at 20,20 radius 3. The
/// default view and window put the snap aperture at 0.125 drawing units.
fn drawing() -> Session {
let mut s = Session::new();
s.script("LINE 0,0 10,0 10,10\n\nCIRCLE 20,20 3\n").unwrap();
assert!(s.running.is_none());
s
}
/// The last line drawn as (start, end).
fn last_line(s: &Session) -> (Vec2, Vec2) {
s.doc().unwrap().model.iter().filter_map(|e| if let EntityKind::Line(l) = &e.kind { Some((l.a.xy(), l.b.xy())) } else { None }).last().unwrap()
}
fn near(p: Vec2, x: f64, y: f64) -> bool {
p.near(Vec2::new(x, y), 1e-9)
}
#[test]
fn typed_overrides_snap_the_next_typed_point() {
let mut s = drawing();
s.cmdline("line end").unwrap();
assert!(s.prompt_text().ends_with("Endpoint of:"), "{}", s.prompt_text());
assert_eq!(s.snap_override(), Some(mode::END));
s.cmdline("9.97,0.03").unwrap();
assert_eq!(s.snap_override(), None, "one pick only");
s.cmdline("_mid 5.04,-0.02").unwrap();
s.cmdline("").unwrap();
let (a, b) = last_line(&s);
assert!(near(a, 10.0, 0.0) && near(b, 5.0, 0.0), "{a:?} {b:?}");
// Long names and the transparent prefix; CEN finds the circle's centre.
s.script("LINE '_center 20.05,19.98\n_endpoint 0.02,0.01\n\n").unwrap();
let (a, b) = last_line(&s);
assert!(near(a, 20.0, 20.0) && near(b, 0.0, 0.0), "{a:?} {b:?}");
// PER from the previous point onto the first line.
s.script("LINE 3,5 PER 3.02,0.01\n\n").unwrap();
let (a, b) = last_line(&s);
assert!(near(a, 3.0, 5.0) && near(b, 3.0, 0.0), "{a:?} {b:?}");
}
#[test]
fn an_override_lasts_one_point_and_non_turns_snapping_off() {
let mut s = drawing();
s.script("LINE END 9.97,0.03 9.97,0.03\n\n").unwrap();
let (a, b) = last_line(&s);
assert!(near(a, 10.0, 0.0) && near(b, 9.97, 0.03), "the second point is not snapped: {b:?}");
s.cmdline("line non").unwrap();
assert_eq!(s.snap_override(), Some(0), "no object snap for the next pick");
s.cmdline("0.01,0.01").unwrap();
// A second override replaces the first.
s.cmdline("mid end 9.99,9.98").unwrap();
s.cmdline("").unwrap();
let (a, b) = last_line(&s);
assert!(near(a, 0.01, 0.01) && near(b, 10.0, 10.0), "{a:?} {b:?}");
assert!(s.point_mods.is_empty());
}
#[test]
fn nothing_to_snap_to_rejects_the_point() {
let mut s = drawing();
s.cmdline("line end 50,50").unwrap();
assert!(s.log.iter().any(|l| l == "No Endpoint found for specified point."), "{:?}", s.log);
assert!(s.prompt_text().contains("Specify first point"), "{}", s.prompt_text());
// A picked point goes through the same override.
s.cmdline("end").unwrap();
s.input(Input::Point(Vec2::new(10.04, 9.96))).unwrap();
assert!(s.prompt_text().contains("Specify next point"), "{}", s.prompt_text());
assert!(near(s.last_point, 10.0, 10.0));
}
#[test]
fn from_nests_with_a_snap_override() {
let mut s = drawing();
s.script("LINE FROM END 10.02,0.01 @0,2\n@5,0\n\n").unwrap();
let (a, b) = last_line(&s);
assert!(near(a, 10.0, 2.0) && near(b, 15.0, 2.0), "{a:?} {b:?}");
}
#[test]
fn tab_cycling_candidates_start_with_the_running_snap() {
let s = drawing();
let d = s.doc().unwrap();
let space = s.space();
let osmode = mode::END | mode::MID | mode::INT | mode::NEA;
let cursor = Vec2::new(9.95, 0.02);
let cands = snap_candidates(d, &space, cursor, 0.125, osmode, None, false);
assert_eq!(cands.first().copied(), snap::osnap(d, &space, cursor, 0.125, osmode, None, false));
let modes: Vec<u32> = cands.iter().map(|h| h.mode).collect();
for m in [mode::END, mode::INT, mode::NEA] {
assert!(modes.contains(&m), "{modes:?}");
}
assert!(!modes.contains(&mode::MID), "no midpoint in the aperture");
assert!(snap_candidates(d, &space, Vec2::new(50.0, 50.0), 0.125, osmode, None, false).is_empty());
}
#[test]
fn a_command_keyword_wins_over_a_snap_word() {
let mut s = drawing();
// ARC's Center keyword is still `cen`; `_cen` is the override.
s.cmdline("arc cen").unwrap();
assert!(s.prompt_text().contains("center"), "{}", s.prompt_text());
assert!(s.point_mods.is_empty());
s.cancel();
s.cmdline("arc _cen").unwrap();
assert!(s.prompt_text().ends_with("Center of:"), "{}", s.prompt_text());
}