Combine: new_component puts the result into a new component (keep_tools already kept the tools)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL
This commit is contained in:
1 parent
214dcf7524
commit
3ee03ac597
2 files changed
+32
-1
No files matched your search
@@ -34,6 +34,8 @@ pub static COMMANDS: &[CommandSpec] = &[
|
|||||||
.params("edges: [[x,y,z] point on edge | {body, index}]; radius: expr; body?; type?: constant|chord (radius is the width across)|variable (radius at the end nearest start, radius2 at the other); radius2?; start?: [x,y,z]"),
|
.params("edges: [[x,y,z] point on edge | {body, index}]; radius: expr; body?; type?: constant|chord (radius is the width across)|variable (radius at the end nearest start, radius2 at the other); radius2?; start?: [x,y,z]"),
|
||||||
CommandSpec::new("solid.chamfer", "Chamfer", chamfer).at("SOLID", "MODIFY").icon("chamfer").params("edges: [[x,y,z] | {body, index}]; distance: expr; distance2?: expr (along the second face) | angle?: expr (from the first face); flip?: bool (which face is first: by default the one facing up most); body?"),
|
CommandSpec::new("solid.chamfer", "Chamfer", chamfer).at("SOLID", "MODIFY").icon("chamfer").params("edges: [[x,y,z] | {body, index}]; distance: expr; distance2?: expr (along the second face) | angle?: expr (from the first face); flip?: bool (which face is first: by default the one facing up most); body?"),
|
||||||
CommandSpec::new("solid.combine", "Combine", combine).at("SOLID", "MODIFY").icon("combine").params("target: body; tools: [body]; operation?: join|cut|intersect; keep_tools?: bool"),
|
CommandSpec::new("solid.combine", "Combine", combine).at("SOLID", "MODIFY").icon("combine").params("target: body; tools: [body]; operation?: join|cut|intersect; keep_tools?: bool"),
|
||||||
|
CommandSpec::new("solid.chamfer", "Chamfer", chamfer).at("SOLID", "MODIFY").icon("chamfer").params("edges: [[x,y,z] | {body, index}]; distance: expr; body?"),
|
||||||
|
CommandSpec::new("solid.combine", "Combine", combine).at("SOLID", "MODIFY").icon("combine").params("target: body; tools: [body]; operation?: join|cut|intersect; keep_tools?: bool; new_component?: bool (the result goes into a new component; component_name?)"),
|
||||||
CommandSpec::new("solid.pattern.rectangular", "Rectangular Pattern", pattern_rect)
|
CommandSpec::new("solid.pattern.rectangular", "Rectangular Pattern", pattern_rect)
|
||||||
.at("SOLID", "CREATE")
|
.at("SOLID", "CREATE")
|
||||||
.icon("pattern_rect")
|
.icon("pattern_rect")
|
||||||
@@ -597,7 +599,19 @@ fn combine(s: &mut Session, p: &Value) -> Result<Value> {
|
|||||||
None => Operation::Join,
|
None => Operation::Join,
|
||||||
Some(o) => Operation::parse(o).filter(|o| *o != Operation::NewBody).ok_or_else(|| bad(cmd, "operation must be join, cut or intersect"))?,
|
Some(o) => Operation::parse(o).filter(|o| *o != Operation::NewBody).ok_or_else(|| bad(cmd, "operation must be join, cut or intersect"))?,
|
||||||
};
|
};
|
||||||
add_feature(s, p, FeatureKind::Combine { target, tools, operation: op, keep_tools: bool_(p, "keep_tools").unwrap_or(false) })
|
let mut out = add_feature(
|
||||||
|
s,
|
||||||
|
p,
|
||||||
|
FeatureKind::Combine { target: target.clone(), tools, operation: op, keep_tools: bool_(p, "keep_tools").unwrap_or(false) },
|
||||||
|
)?;
|
||||||
|
// New Component: the result goes into a component of its own.
|
||||||
|
if bool_(p, "new_component").unwrap_or(false) {
|
||||||
|
let name = str_(p, "component_name").map(str::to_string).unwrap_or_else(|| format!("{target} Combined"));
|
||||||
|
let c = s.execute("component.create", &json!({"name": name, "activate": false}))?;
|
||||||
|
s.execute("component.move_bodies", &json!({"bodies": [target], "component": c["component"]}))?;
|
||||||
|
out["component"] = c["component"].clone();
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn move_bodies(s: &mut Session, p: &Value) -> Result<Value> {
|
fn move_bodies(s: &mut Session, p: &Value) -> Result<Value> {
|
||||||
|
|||||||
@@ -1772,3 +1772,20 @@ fn hole_to_object_and_at_sketch_points() {
|
|||||||
let r = run(&mut t, "solid.hole", json!({"sketch": "Spots", "diameter": 3}));
|
let r = run(&mut t, "solid.hole", json!({"sketch": "Spots", "diameter": 3}));
|
||||||
assert!(rel(w0 - volume(&mut t), 3.0 * PI * 2.25 * 10.0) < 1e-3, "{r} {}", w0 - volume(&mut t));
|
assert!(rel(w0 - volume(&mut t), 3.0 * PI * 2.25 * 10.0) < 1e-3, "{r} {}", w0 - volume(&mut t));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Combine keeps its tools on request and can put its result in a new component.
|
||||||
|
#[test]
|
||||||
|
fn combine_keep_tools_and_new_component() {
|
||||||
|
let mut s = Session::default();
|
||||||
|
run(&mut s, "solid.box", json!({"length": 20, "width": 20, "height": 20, "body_name": "A"}));
|
||||||
|
run(&mut s, "solid.box", json!({"corner": [10, 0, 0], "length": 20, "width": 20, "height": 20, "body_name": "B"}));
|
||||||
|
let r =
|
||||||
|
run(&mut s, "solid.combine", json!({"target": "A", "tools": ["B"], "operation": "cut", "keep_tools": true, "new_component": true}));
|
||||||
|
let comp = r["component"].as_u64().unwrap_or(0);
|
||||||
|
assert!(comp > 0, "{r}");
|
||||||
|
let st = s.model.state();
|
||||||
|
assert!(st.body("B").is_some(), "the tool is kept");
|
||||||
|
let a = st.body("A").unwrap();
|
||||||
|
assert_eq!(s.doc.body_component("A", a.feature), comp);
|
||||||
|
assert!(rel(solvecraft_kernel::measure(&a.body).unwrap().volume, 4000.0) < 1e-9);
|
||||||
|
}
|
||||||
Reference in new issue
Block a user