Skip to content

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

Edit Joint: show components for point and frame origins (#7749) (#10838)

Colin Faulkinghamafe06a1a3d54
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index c32e8665b1..39bc40ba0e 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -2660,6 +2660,7 @@ pub(crate) fn selection_label(s: &Session, names: crate::prefs::OriginPlaneNames
// A point of the model: a vertex, or the centre a round edge stands for.
Sel::Vertex { body, .. } if !body.is_empty() => format!("{body} · point"),
Sel::Feature { id } => s.doc.feature(*id).map(|f| f.name.clone()).unwrap_or_else(|| format!("Feature {id}")),
+ Sel::Occurrence { path } if path.is_empty() => s.doc.name.clone(),
Sel::Occurrence { path } => s.occurrence_placement(path).map(|p| p.name).unwrap_or_else(|_| "Component".into()),
Sel::Vertex { body, point } if body.is_empty() => {
let state = s.world_state();
diff --git a/crates/ui-egui/src/dialogs_assembly.rs b/crates/ui-egui/src/dialogs_assembly.rs
index 845cbe9d7d..22e52c9ec7 100644
--- a/crates/ui-egui/src/dialogs_assembly.rs
+++ b/crates/ui-egui/src/dialogs_assembly.rs
@@ -333,13 +333,24 @@ fn side_inputs() -> Vec<SelInput> {
/// The pick a joint side shows in the side inputs: the face or edge of its own occurrence that
/// the side's snap names (the piece nearest its pick, when the name has several), else the face
-/// or edge nearest the pick. A point or frame side names no face: None.
+/// or edge nearest the pick. A point or frame side names no face, so it shows its component.
fn side_pick(app: &SolveApp, o: &JointOrigin) -> Option<Sel> {
let s = &app.session;
let (pick, face, edge) = match &o.snap {
Snap::FaceCenter { pick, face, .. } | Snap::CircleCenter { pick, face, .. } => (*pick, face.as_deref(), None),
Snap::Edge { pick, edge, .. } => (*pick, None, edge.as_deref()),
- Snap::Point { .. } | Snap::Frame { .. } => return None,
+ Snap::Point { .. } | Snap::Frame { .. } => {
+ let path = if o.occurrence == 0 {
+ Vec::new()
+ } else {
+ let occurrence = s.doc.occurrences.iter().find(|p| p.id == o.occurrence)?;
+ let mut path = s.doc.first_path(occurrence.parent);
+ path.push(occurrence.id);
+ s.doc.path_placement(&path)?;
+ path
+ };
+ return Some(Sel::Occurrence { path });
+ }
};
// The pick is in the component's coordinates; the placed bodies are in the world.
let at =
diff --git a/crates/ui-egui/src/dialogs_assembly_tests.rs b/crates/ui-egui/src/dialogs_assembly_tests.rs
index 3931c4b6de..691ebb3449 100644
--- a/crates/ui-egui/src/dialogs_assembly_tests.rs
+++ b/crates/ui-egui/src/dialogs_assembly_tests.rs
@@ -325,6 +325,72 @@ fn edit_joint_shows_both_sides_and_a_repick_sends_only_that_side() {
assert_ne!(after.b, before.b);
}
+/// Point and frame origins have no face pick, but Edit Joint must still identify their
+/// components (#7749). Showing those components must not replace either stored origin.
+#[test]
+fn edit_joint_shows_components_for_point_and_frame_origins() {
+ for command in ["joint.create", "joint.as_built", "joint.rigid_group"] {
+ let mut app = two_boxes();
+ let (a, b) = (occ(&app, "A"), occ(&app, "B"));
+ let params = match command {
+ "joint.create" => json!({"type": "rigid", "flip": true,
+ "a": {"occurrence": a, "point": [10, 10, 10], "z": [0, 0, 1]},
+ "b": {"occurrence": b, "point": [40, 10, 10], "z": [0, 0, 1]}}),
+ "joint.as_built" => json!({"type": "rigid", "a": a, "b": b}),
+ _ => json!({"occurrences": [a, b]}),
+ };
+ app.run(command, params).unwrap();
+ let before = app.session.doc.assembly.joints[0].clone();
+ let mut d = edit_joint(&app, before.id).unwrap();
+ for (input, (id, name)) in d.inputs.iter().zip([(a, "A:1"), (b, "B:1")]) {
+ let item = input.items.first().expect("the stored component is shown");
+ assert_eq!(item, &Sel::Occurrence { path: vec![id] }, "{command}");
+ assert_eq!(crate::dialogs::selection_label(&app.session, app.preferences.origin_plane_names, &d, input, item), name);
+ }
+ let commands = apply_commands(&app, &d).unwrap();
+ assert!(commands[0].1.get("a").is_none() && commands[0].1.get("b").is_none(), "{commands:?}");
+ for (id, params) in commands {
+ app.run(&id, params).unwrap();
+ }
+ let after = &app.session.doc.assembly.joints[0];
+ assert_eq!((&after.a, &after.b), (&before.a, &before.b), "{command}");
+
+ // Replacing just B with a face still edits only B, preserving A's point/frame.
+ let body = app.session.world_state().bodies.iter().find(|body| occurrence_of_body(&app.session, &body.name) == Some(b)).unwrap().name.clone();
+ let picked = Sel::Face { body, index: 0, point: Vec3::new(40.0, 10.0, 10.0) };
+ d.active = 1;
+ d.pick(&app.session, picked);
+ let commands = apply_commands(&app, &d).unwrap();
+ assert!(commands[0].1.get("a").is_none(), "{commands:?}");
+ assert_eq!(commands[0].1["b"]["occurrence"], b);
+ }
+}
+
+#[test]
+fn edit_joint_component_labels_keep_the_nested_instance_and_root() {
+ let mut app = SolveApp::new(Session::default(), Services::default());
+ let parent = app.run("component.create", json!({"name": "Assembly", "activate": false})).unwrap()["occurrence"].as_u64().unwrap();
+ let first =
+ app.run("component.create", json!({"name": "Part", "parent": "Assembly", "activate": false})).unwrap()["occurrence"].as_u64().unwrap();
+ let second = app.run("occurrence.copy", json!({"occurrence": first})).unwrap()["occurrence"].as_u64().unwrap();
+ let origin = |id| json!({"occurrence": id, "frame": {"origin": [0, 0, 0], "z": [0, 0, 1], "x": [1, 0, 0]}});
+ app.run("joint.create", json!({"type": "rigid", "flip": true, "a": origin(0), "b": origin(second)})).unwrap();
+ let before = app.session.doc.assembly.joints[0].clone();
+ let mut d = edit_joint(&app, before.id).unwrap();
+ for (input, (path, label)) in d.inputs.iter().zip([(vec![], app.session.doc.name.as_str()), (vec![parent, second], "Part:2")]) {
+ let item = input.items.first().expect("the stored component is shown");
+ assert_eq!(item, &Sel::Occurrence { path });
+ assert_eq!(crate::dialogs::selection_label(&app.session, app.preferences.origin_plane_names, &d, input, item), label);
+ }
+ for (id, params) in apply_commands(&app, &d).unwrap() {
+ app.run(&id, params).unwrap();
+ }
+ let after = &app.session.doc.assembly.joints[0];
+ assert_eq!((&after.a, &after.b), (&before.a, &before.b));
+ d.inputs[1].items.clear();
+ assert!(apply_commands(&app, &d).is_err(), "clearing a side still requires a replacement origin");
+}
+
/// A side on a hole's wall shows the wall, a cylinder, not the plate's face beside the hole: the
/// face its snap names is the one the pre-fill takes, however near the other face's plane lies.
#[test]