* claim: #5098 * Sketch: deleting part of a link breaks off the rest instead of rebuilding it (#5098) Deleting some of a link's curves left the rest linked. The next refresh saw a different layout and rebuilt the whole link as normal geometry: the deleted curve came back and the others lost their construction flag (a projected arc returning as a solid arc, a projected face's lines turning solid). sketch.delete now breaks the link for what remains, as Break Link does: those curves stay where they are and keep their flags. Deleting a whole link, and text links, are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FN5eEMrqWWXqi65FcK8GXq * Move the #5098 tests up in sketch_project_tests.rs They sat at the end of the file, where main has since added other tests; moving them next to the break-link test avoids the merge conflict. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: sascha2101 <221609842+sascha2101@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2921,9 +2921,24 @@ fn sketch_delete(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
sk.constraints.retain(|c| !cons.contains(&c.id));
|
||||
let pids: Vec<String> = points.iter().filter_map(|q| sk.points.get(*q).map(|x| x.id.clone())).collect();
|
||||
// Linked geometry from the model, by its entity count before the delete (#5098).
|
||||
let size = |sk: &Sketch, id: &str| sk.link_curves(id).len() + sk.link_points(id).len();
|
||||
let linked: Vec<(String, usize)> = sk
|
||||
.links
|
||||
.iter()
|
||||
.filter(|l| !matches!(l.source, solidcraft_sketch::LinkSource::Text { .. }))
|
||||
.map(|l| (l.id.clone(), size(sk, &l.id)))
|
||||
.collect();
|
||||
sk.remove_curves(&curves);
|
||||
let pidx: Vec<usize> = pids.iter().filter_map(|id| sk.point_index(id)).collect();
|
||||
sk.remove_points(&pidx);
|
||||
// Part of a link deleted: the rest is broken off where it is. Still linked, the next
|
||||
// refresh would rebuild the whole link, deleted curves and all, as normal geometry.
|
||||
for (id, before) in &linked {
|
||||
if sk.link(id).is_some() && size(sk, id) < *before {
|
||||
sk.break_link(id)?;
|
||||
}
|
||||
}
|
||||
doc.prune_model_params();
|
||||
Ok(ids.len())
|
||||
})?;
|
||||
|
||||
@@ -245,6 +245,65 @@ fn break_link_makes_normal_geometry() {
|
||||
assert!(s.execute("sketch.break_link", &json!({"link": "j99"})).is_err());
|
||||
}
|
||||
|
||||
/// The sketch's curves as evaluated (after its links were refreshed): (id, construction).
|
||||
fn evaluated_curves(s: &Session, id: u64) -> Vec<(String, bool)> {
|
||||
s.model.state().sketch(id).unwrap().sketch.curves.iter().map(|c| (c.id.clone(), c.construction)).collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn deleting_part_of_an_intersection_does_not_bring_it_back() {
|
||||
// #5098: a dome, its section on XZ (arc `a1`, line `l1`) as construction, then the arc deleted.
|
||||
let mut s = Session::default();
|
||||
run(&mut s, "sketch.create", json!({"plane": "XZ"}));
|
||||
run(&mut s, "sketch.line", json!({"points": [[0, 0], [10, 0]]}));
|
||||
run(&mut s, "sketch.arc.center_point", json!({"center": [0, 0], "start": [0, -10], "end": [10, 0]}));
|
||||
run(&mut s, "sketch.line", json!({"points": [[0, -10], [0, 0]]}));
|
||||
run(&mut s, "sketch.finish", json!({}));
|
||||
run(&mut s, "solid.revolve", json!({"sketch": 1, "axis": "Z"}));
|
||||
let id = run(&mut s, "sketch.create", json!({"plane": "XZ"}))["sketch"].as_u64().unwrap();
|
||||
let r = run(&mut s, "sketch.intersect", json!({"refs": [{"body": "Body1"}]}));
|
||||
let mut made = ids(&r["created"]["curves"]);
|
||||
made.sort();
|
||||
assert_eq!(made, ["a1", "l1"], "{r}");
|
||||
run(&mut s, "sketch.construction", json!({"curves": ["a1", "l1"], "value": true}));
|
||||
run(&mut s, "sketch.delete", json!({"entities": ["a1"]}));
|
||||
run(&mut s, "sketch.finish", json!({}));
|
||||
// Evaluated, the arc stays gone and the line stays construction: nothing was rebuilt.
|
||||
assert_eq!(evaluated_curves(&s, id), [("l1".to_string(), true)]);
|
||||
// The line no longer follows the body; it kept its place on the section (x from -10 to 10).
|
||||
let sk = s.doc.sketch(id).unwrap();
|
||||
assert!(sk.links.is_empty() && sk.curves.iter().all(|c| c.link.is_none()), "{:?}", sk.links);
|
||||
let mut xs: Vec<f64> = sk.points.iter().filter(|p| p.id != "origin").map(|p| p.pos.x).collect();
|
||||
xs.sort_by(f64::total_cmp);
|
||||
assert!(xs.len() == 2 && (xs[0] + 10.0).abs() < 1e-6 && (xs[1] - 10.0).abs() < 1e-6, "{xs:?}");
|
||||
// Reopened, the same.
|
||||
let reopened = Session::new(solidcraft_doc::Document::from_json(&s.doc.to_json()).unwrap());
|
||||
assert_eq!(evaluated_curves(&reopened, id), [("l1".to_string(), true)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn deleting_one_edge_of_a_projected_face_keeps_the_others_as_they_were() {
|
||||
let mut s = Session::default();
|
||||
run(&mut s, "solid.box", json!({"corner": [0, 0, 0], "length": 20, "width": 20, "height": 10}));
|
||||
let id = run(&mut s, "sketch.create", json!({"plane": "XY", "offset": 15}))["sketch"].as_u64().unwrap();
|
||||
let r = run(&mut s, "sketch.project", json!({"refs": [{"face": [10, 10, 10]}]}));
|
||||
let lines = ids(&r["created"]["curves"]);
|
||||
assert_eq!(lines.len(), 4, "{r}");
|
||||
run(&mut s, "sketch.construction", json!({"curves": lines, "value": true}));
|
||||
run(&mut s, "sketch.delete", json!({"entities": [lines[0]]}));
|
||||
run(&mut s, "sketch.finish", json!({}));
|
||||
let kept: Vec<(String, bool)> = lines[1..].iter().map(|l| (l.clone(), true)).collect();
|
||||
assert_eq!(evaluated_curves(&s, id), kept);
|
||||
|
||||
// Deleting the whole link still just removes it.
|
||||
let id = run(&mut s, "sketch.create", json!({"plane": "XY", "offset": 15}))["sketch"].as_u64().unwrap();
|
||||
let r = run(&mut s, "sketch.project", json!({"refs": [{"face": [10, 10, 10]}]}));
|
||||
run(&mut s, "sketch.delete", json!({"entities": ids(&r["created"]["curves"])}));
|
||||
run(&mut s, "sketch.finish", json!({}));
|
||||
assert!(evaluated_curves(&s, id).is_empty());
|
||||
assert!(s.doc.sketch(id).unwrap().links.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lost_reference_keeps_geometry_with_a_warning() {
|
||||
let mut s = Session::default();
|
||||
|
||||
Reference in New Issue
Block a user