feat: preserve body history and placed modelling workflows

Record ownership transfers in the timeline so earlier Join/Cut membership,
world placement, machining data and styles survive component moves, edits,
independent copying, undo and reopening. Preserve pending positions in history
snapshots and keep constructor transfers ordered during feature redefinition.

Retain shallow sheet pockets and exact planar intersection islands through
unfold/refold, with depth-aware flat previews and DXF export. Store explicit
3D wire coordinate spaces and migrate known legacy provenance without moving
saved points or analytic fits.

Infer unique eligible cylindrical Emboss targets, align Revolve manipulators
with actual extent geometry, and discard obsolete preview errors after input
correction. Certify constructed and immutable imported face styles using exact
source metadata while preserving legacy face names. Upgrade designs to format10
with bounded validation and geometry-preserving legacy migration.
This commit is contained in:
bherbruck committed 2026-10-11 03:59:12 -04:00
1 parent 0398a813c8
commit c1d819f235
86 files changed
+6011 -488

No files matched your search

@@ -0,0 +1,272 @@
use crate::scenario::Harness;
use serde_json::{Value, json};
use solvecraft_engine::doc::{FeatureKind, kernel};
fn fixture(mut h: Harness, extra: Value) -> Harness {
h.app.run("sketch.create", json!({"plane":"XY","name":"Profile"})).unwrap();
h.app.run("sketch.rectangle.two_point", json!({"p0":[10,0],"p1":[15,5]})).unwrap();
h.app.run("sketch.finish", json!({})).unwrap();
let mut params = json!({"sketch":"Profile","axis":"Y","angle":"90 deg","operation":"new","name":"Turn","body_name":"Main"});
params.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone());
h.app.run("solid.revolve", params).unwrap();
h.frames(4);
h
}
fn open(h: &mut Harness) {
h.step(&json!({"call":"ui.view","params":{"view":"front"}})).unwrap();
h.step(&json!({"call":"ui.view","params":{"view":"fit"}})).unwrap();
h.step(&json!({"call":"ui.scroll","params":{"x":700,"y":450,"delta":-400}})).unwrap();
h.step(&json!({"call":"ui.editFeature","params":{"feature":"Turn"}})).unwrap();
h.frames(8);
}
fn at_angle(degrees: f64) -> Value {
let a = degrees.to_radians();
json!([12.5 * a.cos(), 2.5, 12.5 * a.sin()])
}
fn handle_at(h: &mut Harness, name: &str, world: Value) {
let actual = h.at(&json!({"handle":name})).unwrap();
let expected = h.at(&json!({"world":world})).unwrap();
assert!((actual[0] - expected[0]).hypot(actual[1] - expected[1]) < 1.0, "{actual:?} != {expected:?}");
}
fn volume(h: &Harness) -> f64 {
kernel::measure(&h.app.session.world_state().body("Main").unwrap().body).unwrap().volume
}
fn angle(h: &Harness) -> String {
let FeatureKind::Revolve { angle, .. } = &h.app.session.doc.find_feature("Turn").unwrap().kind else { panic!("revolve") };
angle.clone()
}
fn expected_volume(degrees: f64) -> f64 {
0.5 * (225.0 - 100.0) * 5.0 * degrees.to_radians()
}
#[test]
fn actual_positive_negative_axis_and_negative_sweep_drags_follow_geometry() {
for (params, sign) in [(json!({}), 1.0), (json!({"axis":{"origin":[0,0,0],"dir":[0,-2,0]}}), 1.0), (json!({"angle":"-90 deg"}), -1.0)] {
let mut h = fixture(Harness::new(), params.clone());
let original = serde_json::to_value(&h.app.session.doc.find_feature("Turn").unwrap().kind).unwrap();
let names = h.app.session.doc.find_feature("Turn").unwrap().param_names.clone();
let undo = h.app.session.undo.len();
open(&mut h);
handle_at(&mut h, "revolve", at_angle(sign * 90.0));
h.step(&json!({"drag":[{"handle":"revolve"},{"world":at_angle(sign * 60.0)}]})).unwrap();
let commands = crate::dialogs::apply_commands(&h.app, h.app.dialog.as_ref().unwrap()).unwrap();
let preview = h.app.session.preview_world(&commands).unwrap();
assert!((kernel::measure(&preview.after.body("Main").unwrap().body).unwrap().volume - expected_volume(60.0)).abs() < 0.03);
let bounds = preview.after.body("Main").unwrap().mesh().bounds();
if sign > 0.0 {
assert!(bounds.min.z > -1e-8 && bounds.max.z > 12.9);
} else {
assert!(bounds.max.z < 1e-6 && bounds.min.z < -12.9, "{params}: {bounds:?}");
}
h.step(&json!({"widget":"OK"})).unwrap();
assert_eq!(angle(&h), if params.get("angle").is_some() { "-60 deg" } else { "60 deg" });
assert_eq!(h.app.session.doc.find_feature("Turn").unwrap().param_names, names);
assert!((volume(&h) - expected_volume(60.0)).abs() < 0.03);
assert_eq!(h.app.session.undo.len(), undo + 1);
h.app.run("edit.undo", json!({})).unwrap();
assert_eq!(serde_json::to_value(&h.app.session.doc.find_feature("Turn").unwrap().kind).unwrap(), original);
}
}
#[test]
fn symmetric_boundary_drags_edit_included_angle_and_cancel_is_lossless() {
for (handle, sign) in [("revolve", 1.0), ("revolve2", -1.0)] {
let mut h = fixture(Harness::new(), json!({"angle":"120 deg","direction":"symmetric"}));
let original = serde_json::to_value(&*h.app.session.doc).unwrap();
let undo = h.app.session.undo.len();
open(&mut h);
handle_at(&mut h, "revolve", at_angle(60.0));
handle_at(&mut h, "revolve2", at_angle(-60.0));
h.step(&json!({"drag":[{"handle":handle},{"world":at_angle(sign * 45.0)}]})).unwrap();
let crate::dialogs::Kind::Revolve { angle: entered, .. } = &h.app.dialog.as_ref().unwrap().kind else { panic!("revolve") };
assert_eq!(entered, "90 deg");
h.step(&json!({"widget":"Cancel"})).unwrap();
assert_eq!(serde_json::to_value(&*h.app.session.doc).unwrap(), original);
assert_eq!(h.app.session.undo.len(), undo);
open(&mut h);
h.step(&json!({"drag":[{"handle":handle},{"world":at_angle(sign * 45.0)}]})).unwrap();
let crate::dialogs::Kind::Revolve { angle: entered, .. } = &h.app.dialog.as_ref().unwrap().kind else { panic!("revolve") };
assert_eq!(entered, "90 deg", "second {handle} drag");
h.step(&json!({"widget":"OK"})).unwrap();
assert!((volume(&h) - expected_volume(90.0)).abs() < 0.1, "{handle}: {} angle {}", volume(&h), angle(&h));
let bounds = h.app.session.world_state().body("Main").unwrap().mesh().bounds();
assert!((bounds.max.z - 15.0 / 2.0f64.sqrt()).abs() < 0.03 && (bounds.min.z + 15.0 / 2.0f64.sqrt()).abs() < 0.03);
let path = h.dir.join("symmetric.solvecraft");
h.app.run("file.save", json!({"path":path})).unwrap();
h.app.run("doc.open", json!({"path":path})).unwrap();
assert_eq!(angle(&h), "90 deg");
assert!((volume(&h) - expected_volume(90.0)).abs() < 0.1);
}
}
#[test]
fn to_object_displays_derived_sweep_without_dormant_edit_until_angle_selected() {
let mut h = fixture(Harness::new(), json!({"angle":"45 deg","angle2":"30 deg","to":[0,2,12]}));
let original = serde_json::to_value(&h.app.session.doc.find_feature("Turn").unwrap().kind).unwrap();
open(&mut h);
assert!(h.widget("Sweep 90.0°").is_some());
assert!(crate::scenario::handle_at("revolve").is_none());
h.step(&json!({"key":"A","cmd":true})).unwrap();
h.step(&json!({"text":"180 deg"})).unwrap();
let crate::dialogs::Kind::Revolve { angle, .. } = &h.app.dialog.as_ref().unwrap().kind else { panic!("revolve") };
assert_eq!(angle, "45 deg");
h.step(&json!({"widget":"OK"})).unwrap();
assert_eq!(serde_json::to_value(&h.app.session.doc.find_feature("Turn").unwrap().kind).unwrap(), original);
open(&mut h);
h.step(&json!({"click":{"handle":"dialog:Type"}})).unwrap();
h.step(&json!({"click":{"handle":"dialog:Type:Angle"}})).unwrap();
h.step(&json!({"click":{"handle":"dialog:Angle"}})).unwrap();
h.step(&json!({"key":"A","cmd":true})).unwrap();
h.step(&json!({"text":"90 deg"})).unwrap();
h.step(&json!({"widget":"OK"})).unwrap();
let FeatureKind::Revolve { to, angle2, .. } = &h.app.session.doc.find_feature("Turn").unwrap().kind else { panic!("revolve") };
assert!(to.is_none());
assert_eq!(angle2.as_deref(), Some("30 deg"));
assert!((volume(&h) - expected_volume(120.0)).abs() < 0.03);
}
#[test]
fn two_side_boundary_preserves_other_angle_and_parameter_binding() {
let mut h = fixture(Harness::new(), json!({"angle":"60 deg","angle2":"30 deg"}));
h.app.run("solid.box", json!({"length":1,"width":1,"height":"(d2 / (1 rad)) * 1 mm","corner":[30,0,0],"body_name":"Dependent"})).unwrap();
let names = h.app.session.doc.find_feature("Turn").unwrap().param_names.clone();
open(&mut h);
handle_at(&mut h, "revolve", at_angle(60.0));
handle_at(&mut h, "revolve2", at_angle(-30.0));
h.step(&json!({"drag":[{"handle":"revolve2"},{"world":at_angle(-45.0)}]})).unwrap();
h.step(&json!({"widget":"OK"})).unwrap();
let FeatureKind::Revolve { angle, angle2, .. } = &h.app.session.doc.find_feature("Turn").unwrap().kind else { panic!("revolve") };
assert_eq!(angle, "60 deg");
assert_eq!(angle2.as_deref(), Some("45 deg"));
assert_eq!(h.app.session.doc.find_feature("Turn").unwrap().param_names, names);
assert!((h.app.session.world_state().body("Dependent").unwrap().mesh().bounds().max.z - std::f64::consts::FRAC_PI_4).abs() < 1e-8);
assert!((volume(&h) - expected_volume(105.0)).abs() < 0.03);
}
#[test]
fn selected_second_placement_custom_axis_handle_and_preview_stay_in_its_frame() {
let mut h = Harness::new();
let owner = h.app.run("component.create", json!({"name":"Owner"})).unwrap();
let mut h = fixture(h, json!({"axis":{"origin":[0,0,0],"dir":[0,2,0]}}));
let second = h.app.run("occurrence.copy", json!({"component":owner["component"],"translate":[100,0,20]})).unwrap()["occurrence"].clone();
h.app.run("occurrence.move", json!({"occurrence":second,"axis":[0,0,1],"angle":"17 deg"})).unwrap();
h.app.run("component.activate", json!({"component":owner["component"],"occurrence":second,"path":[second]})).unwrap();
let frame = h.app.session.active_component_frame();
let world = |degrees: f64| {
let a = degrees.to_radians();
let p = solvecraft_engine::doc::apply_point(&frame, solvecraft_engine::geom::Vec3::new(12.5 * a.cos(), 2.5, 12.5 * a.sin()));
json!([p.x, p.y, p.z])
};
let axis = match &h.app.session.doc.find_feature("Turn").unwrap().kind {
FeatureKind::Revolve { axis, .. } => axis.clone(),
_ => panic!("revolve"),
};
open(&mut h);
assert!(h.widget("↖ Custom Axis").is_some());
handle_at(&mut h, "revolve", world(90.0));
h.step(&json!({"drag":[{"handle":"revolve"},{"world":world(60.0)}]})).unwrap();
let commands = crate::dialogs::apply_commands(&h.app, h.app.dialog.as_ref().unwrap()).unwrap();
let preview = h.app.session.preview_world(&commands).unwrap();
let placed = preview.after.bodies.iter().find(|body| body.mesh().bounds().center().x > 50.0).unwrap();
assert!((kernel::measure(&placed.body).unwrap().volume - expected_volume(60.0)).abs() < 0.03);
h.step(&json!({"widget":"OK"})).unwrap();
let FeatureKind::Revolve { axis: after, angle, .. } = &h.app.session.doc.find_feature("Turn").unwrap().kind else { panic!("revolve") };
assert_eq!(after, &axis);
assert_eq!(angle, "60 deg");
assert_eq!(h.app.session.active_occurrence_path.as_deref(), Some(&[second.as_u64().unwrap()][..]));
}
#[test]
fn curved_to_object_has_surface_feedback_without_an_angular_handle_or_input() {
let mut h = Harness::new();
h.app.run("solid.cylinder", json!({"radius":3,"height":5,"base":[0,0,12],"axis":"Y","operation":"new","body_name":"Target"})).unwrap();
let mut h = fixture(h, json!({}));
open(&mut h);
h.step(&json!({"click":{"handle":"dialog:Type"}})).unwrap();
h.step(&json!({"click":{"handle":"dialog:Type:To Object"}})).unwrap();
let mut dialog = h.app.dialog.take().unwrap();
dialog.active = dialog.inputs.iter().position(|input| input.label == "To Object").unwrap();
dialog.pick(&h.app.session, solvecraft_engine::Sel::Vertex { body: "Target".into(), point: solvecraft_engine::geom::Vec3::new(0.0, 2.0, 15.0) });
h.app.dialog = Some(dialog);
h.frames(8);
assert!(h.widget("To surface").is_some());
assert!(crate::scenario::handle_at("revolve").is_none());
assert!(crate::scenario::handle_at("revolve2").is_none());
h.step(&json!({"key":"A","cmd":true})).unwrap();
h.step(&json!({"text":"180 deg"})).unwrap();
let crate::dialogs::Kind::Revolve { angle: entered, .. } = &h.app.dialog.as_ref().unwrap().kind else { panic!("revolve") };
assert_eq!(entered, "90 deg");
h.step(&json!({"widget":"Cancel"})).unwrap();
assert_eq!(angle(&h), "90 deg");
}
#[test]
fn free_drag_and_invalid_expression_stay_editable_before_commit() {
let mut h = fixture(Harness::new(), json!({}));
open(&mut h);
h.step(&json!({"drag":[{"handle":"revolve"},{"world":at_angle(37.3)}],"ctrl":true})).unwrap();
let crate::dialogs::Kind::Revolve { angle: entered, .. } = &h.app.dialog.as_ref().unwrap().kind else { panic!("revolve") };
assert!((h.app.session.doc.eval(entered, solvecraft_engine::doc::expr::Kind::Angle).unwrap().to_degrees() - 37.3).abs() < 0.2);
h.step(&json!({"click":{"handle":"dialog:Angle"}})).unwrap();
h.step(&json!({"key":"A","cmd":true})).unwrap();
h.step(&json!({"text":"unknown_angle"})).unwrap();
h.frames(4);
assert!(h.widget("unknown_angle").is_some());
h.step(&json!({"widget":"OK"})).unwrap();
assert!(h.app.dialog.is_some());
h.step(&json!({"click":{"handle":"dialog:Angle"}})).unwrap();
h.step(&json!({"key":"A","cmd":true})).unwrap();
h.step(&json!({"text":"60 deg"})).unwrap();
let crate::dialogs::Kind::Revolve { angle: entered, .. } = &h.app.dialog.as_ref().unwrap().kind else { panic!("revolve") };
assert_eq!(entered, "60 deg");
h.step(&json!({"widget":"OK"})).unwrap();
assert!(h.app.dialog.is_none(), "{:?}", h.app.dialog.as_ref().map(|dialog| &dialog.error));
assert_eq!(angle(&h), "60 deg");
assert!((volume(&h) - expected_volume(60.0)).abs() < 0.03);
}
#[test]
fn second_side_can_be_dragged_to_zero_without_becoming_full_turn() {
let mut h = fixture(Harness::new(), json!({"angle":"60 deg","angle2":"30 deg"}));
open(&mut h);
h.step(&json!({"drag":[{"handle":"revolve2"},{"world":at_angle(0.0)}]})).unwrap();
assert_eq!(h.app.dialog.as_ref().unwrap().extra.get("angle2"), Some(&json!("0 deg")));
h.step(&json!({"widget":"OK"})).unwrap();
let FeatureKind::Revolve { angle2, .. } = &h.app.session.doc.find_feature("Turn").unwrap().kind else { panic!("revolve") };
assert_eq!(angle2.as_deref(), Some("0 deg"));
assert!((volume(&h) - expected_volume(60.0)).abs() < 0.03);
}
#[test]
fn edge_on_ring_drag_uses_nearest_projected_branch() {
let mut h = fixture(Harness::new(), json!({}));
open(&mut h);
h.step(&json!({"call":"ui.view","params":{"view":"top"}})).unwrap();
handle_at(&mut h, "revolve", at_angle(90.0));
h.step(&json!({"drag":[{"handle":"revolve"},{"world":at_angle(60.0)}]})).unwrap();
h.step(&json!({"widget":"OK"})).unwrap();
assert_eq!(angle(&h), "60 deg");
assert!((volume(&h) - expected_volume(60.0)).abs() < 0.03);
}
#[test]
fn legacy_reversed_axis_symmetric_interval_is_shown_and_preserved_exactly() {
let mut h = fixture(Harness::new(), json!({"axis":{"origin":[0,0,0],"dir":[0,-2,0]},"direction":"symmetric","angle":"120 deg"}));
let original = serde_json::to_value(&h.app.session.doc.find_feature("Turn").unwrap().kind).unwrap();
let before = h.app.session.world_state().body("Main").unwrap().mesh().bounds();
assert!(before.min.x < -14.9 && before.max.x < 7.6 && before.min.z > -1e-6 && before.max.z > 14.9);
open(&mut h);
handle_at(&mut h, "revolve", at_angle(180.0));
handle_at(&mut h, "revolve2", at_angle(60.0));
h.step(&json!({"widget":"OK"})).unwrap();
assert_eq!(serde_json::to_value(&h.app.session.doc.find_feature("Turn").unwrap().kind).unwrap(), original);
assert_eq!(h.app.session.world_state().body("Main").unwrap().mesh().bounds(), before);
open(&mut h);
h.step(&json!({"drag":[{"handle":"revolve"},{"world":at_angle(135.0)}]})).unwrap();
h.step(&json!({"widget":"OK"})).unwrap();
assert_eq!(angle(&h), "90 deg");
let after = h.app.session.world_state().body("Main").unwrap().mesh().bounds();
assert!((after.min.x + 15.0 / 2.0f64.sqrt()).abs() < 0.03 && (after.max.x - 15.0 / 2.0f64.sqrt()).abs() < 0.03);
assert!(after.min.z > 7.0 && after.max.z > 14.9);
assert!((volume(&h) - expected_volume(90.0)).abs() < 0.1);
}