Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Pieces of a cut keep their names when the design is evaluated again (#11658)

semmelrinded25f8198fa27
diff --git a/crates/doc/src/lineage.rs b/crates/doc/src/lineage.rs
index 94557d6114..386e1c3332 100644
--- a/crates/doc/src/lineage.rs
+++ b/crates/doc/src/lineage.rs
@@ -757,10 +757,19 @@ pub(crate) fn order_lumps(bodies: &mut [crate::ModelBody], origin: &Arc<crate::n
// cut body's own feature's and the rest are the cut's, and `body.rename` stores a name in
// the `body_names` of the feature a body says made it (#10438).
let names: Vec<(String, u64)> = members.iter().filter_map(|i| bodies.get(*i).map(|b| (b.name.clone(), b.feature))).collect();
- for ((name, feature), (_, i)) in names.into_iter().zip(keys) {
- if let Some(b) = bodies.get_mut(i) {
- b.name = name;
- b.feature = feature;
+ // The pieces take the family's places in that order too, so the state lists them as
+ // their names run. The session pins a feature's body names in state order, and the next
+ // evaluation hands them out in this order: listed in the kernel's order, the pieces
+ // swapped names once the design was evaluated again from its pinned names (opened).
+ let moved: Vec<crate::ModelBody> = keys.iter().filter_map(|(_, i)| bodies.get(*i).cloned()).collect();
+ if moved.len() != members.len() || names.len() != members.len() {
+ continue;
+ }
+ for ((mut b, (name, feature)), place) in moved.into_iter().zip(names).zip(&members) {
+ b.name = name;
+ b.feature = feature;
+ if let Some(slot) = bodies.get_mut(*place) {
+ *slot = b;
}
}
}
diff --git a/crates/engine/src/naming_history_tests.rs b/crates/engine/src/naming_history_tests.rs
index 616668746a..bd7ea0f7b6 100644
--- a/crates/engine/src/naming_history_tests.rs
+++ b/crates/engine/src/naming_history_tests.rs
@@ -264,6 +264,40 @@ fn pieces_of_a_cut_body_keep_their_body_names_when_the_cut_moves() {
}
}
+/// A hole that cuts a body in three pieces names them as the design names them when it is
+/// evaluated again from the names it pinned, as on opening it. Found by the model fuzzer: the two
+/// smaller pieces swapped names there, so a later feature naming one of them met the other.
+#[test]
+fn pieces_of_a_cut_keep_their_names_when_the_design_is_evaluated_again() {
+ let mut s = Session::default();
+ run(&mut s, "construct.plane.offset", json!({"base": "XZ", "name": "P8", "offset": 5}));
+ run(&mut s, "sketch.create", json!({"plane": "P8"}));
+ run(&mut s, "sketch.rectangle.two_point", json!({"p0": [-7, -9], "p1": [5, -7]}));
+ run(&mut s, "sketch.finish", json!({}));
+ run(&mut s, "solid.extrude", json!({"distance": 5, "operation": "join"}));
+ run(&mut s, "sketch.create", json!({"plane": "XZ"}));
+ run(&mut s, "sketch.circle.center", json!({"center": [7, -3], "radius": 4}));
+ run(&mut s, "sketch.finish", json!({}));
+ run(&mut s, "solid.extrude", json!({"distance": 5, "operation": "join"}));
+ run(&mut s, "solid.hole", json!({"depth": 14, "diameter": 5, "position": [-1, 10, 8]}));
+ // Each body by name, with where it is (two pieces have the same volume).
+ let pieces = |st: &solidcraft_doc::ModelState| -> Vec<(String, String)> {
+ st.bodies
+ .iter()
+ .map(|b| {
+ let m = solidcraft_kernel::measure(&b.body).unwrap();
+ (b.name.clone(), format!("{:.3} {:.3} {:.3} {:.3}", m.volume, m.centroid.x, m.centroid.y, m.centroid.z))
+ })
+ .collect()
+ };
+ let live = pieces(&s.model.state());
+ assert_eq!(live.len(), 3, "{live:?}");
+ let mut again = solidcraft_doc::Model::new();
+ again.no_cache = true;
+ again.evaluate(&s.doc);
+ assert_eq!(pieces(&again.state()), live);
+}
+
#[test]
fn a_name_of_a_body_without_history_is_found_by_geometry_and_says_so_once_it_moves() {
let mut s = Session::default();