diff --git a/crates/doc/src/document.rs b/crates/doc/src/document.rs index 0a86575b1..7db144614 100644 --- a/crates/doc/src/document.rs +++ b/crates/doc/src/document.rs @@ -1044,6 +1044,8 @@ pub enum FeatureKind { Split { body: BodyName, plane: PlaneRef, + // The tool face is picked (and named), so the split follows it (#11674). + #[walk(picks_faces)] #[serde(default, skip_serializing_if = "Option::is_none")] tool: Option, /// A straight line of this sketch as the tool (#1552): the plane through it along the diff --git a/crates/doc/src/feature_geometry.rs b/crates/doc/src/feature_geometry.rs index f5536a212..1ee5565b2 100644 --- a/crates/doc/src/feature_geometry.rs +++ b/crates/doc/src/feature_geometry.rs @@ -55,7 +55,8 @@ impl FeatureKind { /// The body a feature that works on one body's faces names (shell, draft, split, offset, /// delete and replace face, surface offset, the placed plastic features, sheet metal - /// conversion, ruled surface, untrim): its face points pick faces of that body. + /// conversion, ruled surface, untrim, Split Body's tool face): its face points pick faces of + /// that body. pub fn face_body(&self) -> Option<&str> { match self { FeatureKind::Shell { body, .. } @@ -69,7 +70,7 @@ impl FeatureKind { | FeatureKind::SnapFit { body, .. } | FeatureKind::Rest { body, .. } => body.as_deref(), FeatureKind::SheetConvert { body, .. } | FeatureKind::SurfaceRuled { body, .. } => Some(body.as_ref()), - FeatureKind::SurfaceUntrim { face, .. } => Some(face.body.as_ref()), + FeatureKind::SurfaceUntrim { face, .. } | FeatureKind::Split { tool: Some(face), .. } => Some(face.body.as_ref()), _ => None, } } diff --git a/crates/doc/src/feature_walk_tests/golden_geometry.txt b/crates/doc/src/feature_walk_tests/golden_geometry.txt index 1c41447e0..5c6547d84 100644 --- a/crates/doc/src/feature_walk_tests/golden_geometry.txt +++ b/crates/doc/src/feature_walk_tests/golden_geometry.txt @@ -86,6 +86,7 @@ construction_plane moves: plane.axis_dir[0], plane.axis_dir[1], plane.axis_origin[0], plane.axis_origin[1], plane.axis_origin[2] split moves: plane.axis_dir[0], plane.axis_dir[1], plane.axis_origin[0], plane.axis_origin[1], plane.axis_origin[2], tool.point[0], tool.point[1], tool.point[2] + face points: [0, 0, 0] split_line moves: plane.axis_dir[0], plane.axis_dir[1], plane.axis_origin[0], plane.axis_origin[1], plane.axis_origin[2] construction_axis diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index c073a58e4..4280dc95f 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -2555,6 +2555,34 @@ fn split_body_by_a_face() { assert!(s.execute("solid.split_body", &json!({"body": "Block", "tool": {"body": "Tool", "point": [100, 0, 0]}})).is_err()); } +/// Split Body by a face follows the face when a parameter moves it (#11674): the tool face is +/// named when it is picked, as other face picks are, and found again where it went. +#[test] +fn split_body_by_a_face_follows_the_face() { + let build = |h: &str, z: f64| { + let mut s = Session::default(); + run(&mut s, "parameters.add", json!({"name": "h", "expression": h})); + run(&mut s, "solid.box", json!({"length": 40, "width": 40, "height": 200, "center": [0, 0, 100], "body_name": "Post"})); + run(&mut s, "solid.cylinder", json!({"diameter": 42, "height": 300, "base": [-150, 0, "h"], "axis": "X", "body_name": "Rail"})); + run(&mut s, "solid.split_body", json!({"body": "Post", "tool": {"body": "Rail", "point": [0, 0, z]}})); + s + }; + let volumes = |s: &Session| { + let st = s.world_state().unwrap(); + let mut v: Vec = + st.bodies.iter().filter(|b| b.name.starts_with("Post")).map(|b| solidcraft_kernel::measure(&b.body).unwrap().volume).collect(); + v.sort_by(f64::total_cmp); + v + }; + let mut s = build("100 mm", 79.0); + run(&mut s, "parameters.change", json!({"name": "h", "expression": "150 mm"})); + let errors: Vec = s.model.results.iter().filter_map(|r| r.error.as_ref().map(|e| format!("{}: {e}", r.name))).collect(); + assert!(errors.is_empty(), "{errors:?}"); + // As if the rail had been at 150 mm when the face was picked. + let (got, want) = (volumes(&s), volumes(&build("150 mm", 129.0))); + assert!(got.len() >= 2 && got.len() == want.len() && got.iter().zip(&want).all(|(a, b)| rel(*a, *b) < 1e-9), "{got:?} against {want:?}"); +} + /// Split Body by a sketch line (#1552): the plane through the line along the sketch's normal /// splits a box; the split follows the line when the sketch changes, the design saves the line, /// and anything but a straight line of a sketch is refused.