A Mirror window for sketch entities, holding both picks until OK (#734)

Sketch Mirror now opens a tool window with Entities and Mirror line inputs, so both picks stay visible and editable until OK, replacing the old click-then-right-click flow.

crates/ui-egui/src/sketch_modify_ui_tests.rs

@@ -1,12 +1,14 @@
-//! The Sketch Scale tool window: the toolbar button used to reach no tool and no dialog, so a
-//! press ran `sketch.scale` with no parameters and the engine refused it.
+//! The sketch modify tool windows. Sketch Scale's toolbar button used to reach no tool and no
+//! dialog, so a press ran `sketch.scale` with no parameters and the engine refused it. Mirror
+//! ran as a click flow that collected entities until a right-click, took the next click as the
+//! mirror line and committed at once, with nothing on screen saying what was picked.
 
 use serde_json::json;
 use solidcraft_engine::Sel;
 
 use crate::dialogs::Kind;
 use crate::scenario::Harness;
-use crate::selection::SelInput;
+use crate::selection::{AXES, CURVES, POINTS, SelInput};
 use crate::sketch_modify_ui::{Mod, commands};
 
 /// A sketch on XY holding one 20 by 10 rectangle at the origin.
@@ -124,3 +126,116 @@ fn the_window_scales_the_picked_geometry_and_leaves_the_rest_alone() {
     assert!(xs.iter().any(|x| (x - 60.0).abs() < 1e-6), "{xs:?}");
     assert_eq!(sk.curves.len(), 5);
 }
+
+/// A sketch on XY holding a vertical line on the Y axis and a circle to its right.
+fn line_and_circle() -> Harness {
+    let mut h = Harness::new();
+    h.app.run("sketch.create", json!({"plane": "XY"})).unwrap();
+    h.app.run("sketch.line", json!({"points": [[0, -20], [0, 20]]})).unwrap();
+    h.app.run("sketch.circle.center", json!({"center": [10, 0], "radius": 3})).unwrap();
+    h.settle();
+    h
+}
+
+fn mirror_inputs() -> Vec<SelInput> {
+    vec![SelInput::new("Entities", CURVES | POINTS, true), SelInput::new("Mirror line", AXES, false)]
+}
+
+#[test]
+fn the_toolbar_button_opens_a_window_with_both_picks_visible() {
+    let mut h = line_and_circle();
+    let before = curve_ids(&h).len();
+    h.step(&json!({"start": "sketch.mirror"})).unwrap();
+    let d = h.app.dialog.as_ref().expect("sketch.mirror opens a tool window");
+    assert!(matches!(d.kind, Kind::SketchModify(Mod::Mirror)), "{:?}", d.kind);
+    assert_eq!(d.inputs.iter().map(|i| i.label).collect::<Vec<_>>(), vec!["Entities", "Mirror line"]);
+    assert!(h.app.tool.is_none(), "the dialog replaces the old click tool");
+    // Opening the window commits nothing.
+    assert_eq!(curve_ids(&h).len(), before);
+}
+
+#[test]
+fn the_two_picks_become_the_command() {
+    let h = line_and_circle();
+    let ids = curve_ids(&h);
+    let (line, circle) = (ids[0].clone(), ids[1].clone());
+    let mut inputs = mirror_inputs();
+    inputs[0].items = vec![Sel::SketchCurve { id: circle.clone() }];
+    inputs[1].items = vec![Sel::SketchCurve { id: line.clone() }];
+    let out = commands(&h.app, &Mod::Mirror, &inputs, &serde_json::Map::new()).unwrap();
+    assert_eq!(out.len(), 1);
+    assert_eq!(out[0].0, "sketch.mirror");
+    assert_eq!(out[0].1, json!({"entities": [circle], "line": line}));
+}
+
+#[test]
+fn a_half_filled_window_is_an_error_instead_of_a_command() {
+    let h = line_and_circle();
+    let ids = curve_ids(&h);
+    let mut only_entities = mirror_inputs();
+    only_entities[0].items = vec![Sel::SketchCurve { id: ids[1].clone() }];
+    assert!(commands(&h.app, &Mod::Mirror, &only_entities, &serde_json::Map::new()).is_err());
+    let mut only_line = mirror_inputs();
+    only_line[1].items = vec![Sel::SketchCurve { id: ids[0].clone() }];
+    assert!(commands(&h.app, &Mod::Mirror, &only_line, &serde_json::Map::new()).is_err());
+    // The AXES mask also takes an origin axis, which is no curve of this sketch.
+    let mut origin_axis = mirror_inputs();
+    origin_axis[0].items = vec![Sel::SketchCurve { id: ids[1].clone() }];
+    origin_axis[1].items = vec![Sel::Axis { name: "Y".into() }];
+    assert!(commands(&h.app, &Mod::Mirror, &origin_axis, &serde_json::Map::new()).is_err());
+    // The line itself must not be in the entities: the old click flow could not express that
+    // either, and the engine silently dropped it.
+    let mut line_in_both = mirror_inputs();
+    line_in_both[0].items = vec![Sel::SketchCurve { id: ids[0].clone() }];
+    line_in_both[1].items = vec![Sel::SketchCurve { id: ids[0].clone() }];
+    assert!(commands(&h.app, &Mod::Mirror, &line_in_both, &serde_json::Map::new()).is_err());
+}
+
+#[test]
+fn the_window_reflects_the_picked_circle_across_the_line() {
+    let mut h = line_and_circle();
+    let sid = h.app.session.active_sketch.unwrap();
+    let ids = curve_ids(&h);
+    h.step(&json!({"start": "sketch.mirror"})).unwrap();
+    {
+        let d = h.app.dialog.as_mut().unwrap();
+        d.inputs[0].items = vec![Sel::SketchCurve { id: ids[1].clone() }];
+        d.inputs[1].items = vec![Sel::SketchCurve { id: ids[0].clone() }];
+    }
+    // A frame with the picks in place: the dialog reads them when it next draws.
+    h.frames(2);
+    h.step(&json!({"key": "Enter"})).unwrap();
+    h.settle();
+    assert!(h.app.dialog.is_none(), "Enter applies and closes the window");
+    let st = h.app.session.model.state();
+    let sk = &st.sketch(sid).unwrap().sketch;
+    assert_eq!(sk.curves.len(), 3, "{:?}", h.app.status);
+    let made = sk.curves.last().unwrap();
+    // `CurveKind` is not Copy: match the field behind its reference.
+    let solidcraft_engine::sketch::CurveKind::Circle { c, r } = &made.kind else { panic!("{:?}", made.kind) };
+    let at = sk.point(*c).unwrap();
+    assert!((at.x + 10.0).abs() < 1e-6 && at.y.abs() < 1e-6, "{at:?}");
+    assert!((*r - 3.0).abs() < 1e-6, "{r}");
+}
+
+#[test]
+fn escape_leaves_the_sketch_exactly_as_it_was() {
+    let mut h = line_and_circle();
+    let sid = h.app.session.active_sketch.unwrap();
+    let undo = h.app.session.undo.len();
+    let before = curve_ids(&h);
+    let constraints = h.app.session.model.state().sketch(sid).unwrap().sketch.constraints.len();
+    h.step(&json!({"start": "sketch.mirror"})).unwrap();
+    {
+        let d = h.app.dialog.as_mut().unwrap();
+        d.inputs[0].items = vec![Sel::SketchCurve { id: before[1].clone() }];
+        d.inputs[1].items = vec![Sel::SketchCurve { id: before[0].clone() }];
+    }
+    h.frames(2);
+    h.step(&json!({"key": "Escape"})).unwrap();
+    h.settle();
+    assert!(h.app.dialog.is_none());
+    assert_eq!(curve_ids(&h), before);
+    assert_eq!(h.app.session.undo.len(), undo);
+    assert_eq!(h.app.session.model.state().sketch(sid).unwrap().sketch.constraints.len(), constraints);
+}