Dialog parity with Fusion: header with fold glyph, label column, Select/N selected chips, info glyph and OK greyed until valid, Fusion colours; Extrude rows Start (profile plane/offset), Direction (one side, two sides, symmetric), Extent Type (distance/all), Taper Angle; Hole rows Placement (single/multiple sketch points), Extents, Hole Tap Type (tapped size), Drill Point, Tip Angle; pattern Type switch; Mirror operation; pre-selection routes every item to the input that takes it (planar-only inputs, fillet tangent chains), with tests

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL
2026-10-08 05:51:10 +00:00
1 parent a8d54e0a3f
commit 89c2c440ac
@@ -0,0 +1,133 @@
+//! Pre-selection fills every input of a command, each item going to the input that takes its
+//! type, whether the command starts from a shortcut, the toolbar or a menu.
+
+use serde_json::json;
+use solvecraft_engine::geom::Vec3;
+use solvecraft_engine::{Sel, Session};
+
+use crate::dialogs::{Dialog, Kind, apply_commands};
+use crate::{Services, SolveApp};
+
+fn app_with(script: serde_json::Value) -> SolveApp {
+    let mut s = Session::default();
+    s.run_script(&script).unwrap();
+    SolveApp::new(s, Services::default())
+}
+
+fn boxed() -> SolveApp {
+    app_with(json!([{"command": "PrimitiveBox", "params": {"length": 40, "width": 30, "height": 20}}]))
+}
+
+/// The face of Body1 whose centre is at `c`.
+fn face(app: &SolveApp, c: Vec3) -> Sel {
+    let st = app.session.model.state();
+    let b = st.body("Body1").unwrap();
+    let f = b.body.faces(0.01).unwrap().into_iter().find(|f| f.centroid.dist(c) < 1e-6).unwrap();
+    Sel::Face { body: "Body1".into(), index: f.index, point: c }
+}
+
+fn edge(app: &SolveApp, p: Vec3) -> Sel {
+    let st = app.session.model.state();
+    let m = st.body("Body1").unwrap().mesh();
+    let i = m.edges.iter().position(|e| e.windows(2).any(|w| p.dist_to_segment(w[0], w[1]) < 1e-9)).unwrap();
+    Sel::Edge { body: "Body1".into(), index: i, point: p }
+}
+
+fn start(app: &mut SolveApp, sels: Vec<Sel>, id: &str) -> Dialog {
+    app.session.selection = sels;
+    app.start(id);
+    app.dialog.clone().unwrap()
+}
+
+#[test]
+fn profiles_then_extrude_takes_them_all() {
+    let mut app = app_with(json!([
+        {"command": "SketchCreate", "params": {"plane": "XY"}},
+        {"command": "CircleCenterRadius", "params": {"center": [0, 0], "radius": 5}},
+        {"command": "CircleCenterRadius", "params": {"center": [20, 0], "radius": 5}},
+        {"command": "SketchStop", "params": {}},
+    ]));
+    let sk = app.session.doc.features.first().unwrap().id;
+    let d = start(&mut app, vec![Sel::Profile { sketch: sk, index: 0 }, Sel::Profile { sketch: sk, index: 1 }], "Extrude");
+    assert_eq!(d.inputs[0].items.len(), 2);
+    assert!(d.focus, "the value box takes the keyboard");
+    assert!(apply_commands(&app, &d).is_ok());
+}
+
+#[test]
+fn edges_then_fillet_takes_them_with_chains() {
+    let mut app = boxed();
+    let (a, b) = (edge(&app, Vec3::new(0.0, 0.0, 10.0)), edge(&app, Vec3::new(20.0, 0.0, 20.0)));
+    let d = start(&mut app, vec![a, b], "FusionFilletEdgesCommand");
+    assert_eq!(d.inputs[0].items.len(), 2, "box edges are not tangent to others");
+    let cmds = apply_commands(&app, &d).unwrap();
+    assert_eq!(cmds[0].1["edges"].as_array().unwrap().len(), 2);
+}
+
+#[test]
+fn face_then_extrude_press_pulls_it() {
+    let mut app = boxed();
+    let top = face(&app, Vec3::new(20.0, 15.0, 20.0));
+    let d = start(&mut app, vec![top], "Extrude");
+    let cmds = apply_commands(&app, &d).unwrap();
+    assert!(cmds[0].1.get("face").is_some());
+}
+
+#[test]
+fn faces_then_shell_and_face_then_hole() {
+    let mut app = boxed();
+    let top = face(&app, Vec3::new(20.0, 15.0, 20.0));
+    let front = face(&app, Vec3::new(20.0, 0.0, 10.0));
+    let d = start(&mut app, vec![top.clone(), front], "FusionShellBodyCommand");
+    assert_eq!(d.inputs[0].items.len(), 2);
+    let d = start(&mut app, vec![top], "FusionHoleCommand");
+    assert_eq!(d.inputs[0].items.len(), 1);
+    let cmds = apply_commands(&app, &d).unwrap();
+    assert!(cmds[0].1.get("position").is_some());
+}
+
+#[test]
+fn line_and_profile_then_revolve_routes_each() {
+    let mut app = app_with(json!([
+        {"command": "SketchCreate", "params": {"plane": "XZ"}},
+        {"command": "ShapeRectangleTwoPoint", "params": {"p0": [10, 0], "p1": [20, 10]}},
+        {"command": "DrawPolyline", "params": {"points": [[0, 0], [0, 30]], "ids": ["axis"]}},
+    ]));
+    let sk = app.session.active_sketch.unwrap();
+    let d = start(&mut app, vec![Sel::SketchCurve { id: "axis".into() }, Sel::Profile { sketch: sk, index: 0 }], "Revolve");
+    assert_eq!(d.inputs[0].items, vec![Sel::Profile { sketch: sk, index: 0 }]);
+    assert_eq!(d.inputs[1].items, vec![Sel::SketchCurve { id: "axis".into() }]);
+}
+
+#[test]
+fn face_then_move_takes_the_body_and_odd_items_are_ignored() {
+    let mut app = boxed();
+    let top = face(&app, Vec3::new(20.0, 15.0, 20.0));
+    let d = start(&mut app, vec![top, Sel::Axis { name: "X".into() }], "FusionMoveCommand");
+    assert_eq!(d.inputs[0].items, vec![Sel::Body { name: "Body1".into() }]);
+    assert!(matches!(d.kind, Kind::Move { .. }));
+}
+
+#[test]
+fn hole_at_sketch_points() {
+    let mut app = app_with(json!([
+        {"command": "PrimitiveBox", "params": {"length": 40, "width": 30, "height": 20}},
+        {"command": "SketchCreate", "params": {"plane": {"face": [20, 15, 20]}}},
+        {"command": "DrawPoint", "params": {"point": [10, 10], "id": "h1"}},
+        {"command": "DrawPoint", "params": {"point": [30, 20], "id": "h2"}},
+        {"command": "SketchStop", "params": {}},
+    ]));
+    let sk = app.session.doc.features.iter().find(|f| matches!(f.kind, solvecraft_engine::doc::FeatureKind::Sketch { .. })).unwrap().id;
+    app.start("FusionHoleCommand");
+    let mut d = app.dialog.clone().unwrap();
+    if let Kind::Hole { opts, .. } = &mut d.kind {
+        opts.multiple = true;
+    }
+    d.inputs = vec![crate::selection::SelInput::new("Points", crate::selection::POINTS, true)];
+    d.inputs[0].items = vec![Sel::SketchPoint { id: format!("{sk}:h1") }, Sel::SketchPoint { id: format!("{sk}:h2") }];
+    let cmds = apply_commands(&app, &d).unwrap();
+    assert_eq!(cmds.len(), 1);
+    assert_eq!(cmds[0].1["points"], json!(["h1", "h2"]));
+    let r = app.session.execute(&cmds[0].0, &cmds[0].1);
+    assert!(r.is_ok(), "{r:?}");
+}