SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Section Analysis: the drag arrow is back when the dialog is reopened (#11423) (#11432)
semmelrindec1a23f8f97b1
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rsindex 92e80623d7..1bed89a68d 100644--- a/crates/ui-egui/src/canvas.rs+++ b/crates/ui-egui/src/canvas.rs@@ -23,7 +23,8 @@ use crate::viewport::{Proj, projected_polygon};/// direction a growing value points.pub fn anchor(app: &SolveApp, d: &Dialog) -> Option<(Vec3, Option<Vec3>)> {let st = crate::open_meshing::session_world(&app.session);- let first = &anchor_item(app, d)?;+ let item = anchor_item(app, d);+ let Some(first) = &item else { return section_plane(d) };let (at, normal) = match first {Sel::Profile { sketch, index } => {let ss = st.sketch(*sketch)?;@@ -253,6 +254,18 @@ pub(crate) fn blend_grow_dir(m: &Mesh, index: usize, p: Vec3) -> Option<Vec3> {Some(if edge_concave(m, index, p).unwrap_or(false) { n } else { -n })}+/// A Section Analysis dialog reopened from its section's own geometry (Show viewport section+/// status): the plane it keeps as numbers when nothing is picked, so its arrow stands there as on+/// a picked plane (#11423).+fn section_plane(d: &Dialog) -> Option<(Vec3, Option<Vec3>)> {+ if !matches!(d.kind, Kind::Section { .. }) {+ return None;+ }+ let plane = d.extra.get("plane")?;+ let point = |key: &str| serde_json::from_value::<[f64; 3]>(plane.get(key)?.clone()).ok().map(|[x, y, z]| Vec3::new(x, y, z));+ Some((point("origin")?, Some(point("normal")?.normalized()?)))+}+/// The pick the dialog's arrow sits on: the first, or for a fillet or chamfer reopened from a/// click on one of its faces (Press Pull), its edge nearest the click, at the point on it nearest/// the click (#4986).diff --git a/crates/ui-egui/src/section_browser_tests.rs b/crates/ui-egui/src/section_browser_tests.rsindex a994456b7c..a68f66d945 100644--- a/crates/ui-egui/src/section_browser_tests.rs+++ b/crates/ui-egui/src/section_browser_tests.rs@@ -265,3 +265,38 @@ fn section_ribbon_toggle_and_setting_edit_have_separate_intent_and_compatibilityassert!(h.app.dialog.is_some());assert_eq!(h.app.session.section, cut);}++/// Reopened from a section's own geometry (Graphics → Show viewport section status), the dialog+/// holds the plane as numbers and picks none: the drag arrow still stands on that plane and its+/// tip reaches the cut (#11423). A plane picked afterwards takes the arrow over.+#[test]+fn a_section_reopened_from_its_geometry_keeps_its_drag_arrow() {+ use solidcraft_engine::doc::expr::Kind as ValueKind;+ for params in [+ json!({"plane":"XY","at":-25.4,"flip":true}),+ json!({"plane":{"origin":[7,-12,4],"normal":[-3,-4,0]},"offset":5}),+ json!({"plane":{"origin":[7,-12,4],"normal":[0,0,-1]},"offset":-5,"flip":true}),+ ] {+ let mut h = harness();+ h.app.preferences.viewport_section_status = true;+ h.app.run("solid.box", json!({"length":40,"width":30,"height":20})).unwrap();+ h.app.run("inspect.section", params.clone()).unwrap();+ h.frames(3);+ let cut = h.app.session.section.unwrap();+ menu(&mut h, "Edit Section Analysis");+ let (offset, _, plane) = section_dialog(&h);+ assert!(plane.is_empty(), "{params}: no plane picked: {plane:?}");+ let d = h.app.dialog.as_ref().unwrap();+ let (base, dir) = crate::canvas::anchor(&h.app, d).unwrap_or_else(|| panic!("{params}: no arrow"));+ let dir = dir.unwrap_or_else(|| panic!("{params}: an arrow with no direction"));+ let distance = crate::length_input::eval(&h.app.session.doc, &offset, ValueKind::Length).unwrap();+ let tip = base + dir * distance;+ assert!((tip - cut.0).len() < 1e-9, "{params}: the arrow ends at {tip:?}, the cut is at {:?}", cut.0);+ assert!(dir.cross(cut.1).len() < 1e-9, "{params}: the arrow runs along the cut's normal: {dir:?} vs {:?}", cut.1);++ let mut d = h.app.dialog.take().unwrap();+ d.pick(&h.app.session, solidcraft_engine::Sel::Plane { name: "XZ".into() });+ let (_, dir) = crate::canvas::anchor(&h.app, &d).unwrap_or_else(|| panic!("{params}: no arrow on the picked plane"));+ assert!(dir.is_some_and(|n| (n.y.abs() - 1.0).abs() < 1e-9), "{params}: the picked plane's arrow: {dir:?}");+ }+}