686576e368
Edit Section Analysis (its menu item, or a double-click on its browser row) opened the dialog at distance 0 with no plane, so moving the cut on by a millimetre meant picking the plane and typing the whole distance again. OK now keeps the dialog's plane pick, distance and flip with the cut they made, and Edit starts from them while the section shown (or hidden) is still that cut. The toolbar still starts a new section afresh, and a section made some other way (a command, an agent) opens the dialog as before. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
151 lines
6.2 KiB
Rust
151 lines
6.2 KiB
Rust
//! Section Analysis in the browser (#822): an Analysis folder lists it with an eye to hide and
|
|
//! show it, and its menu edits or deletes it.
|
|
|
|
use egui::pos2;
|
|
use serde_json::json;
|
|
|
|
use crate::context_menu::{self, Target};
|
|
use crate::scenario::Harness;
|
|
use crate::test_support::click;
|
|
|
|
fn harness() -> Harness {
|
|
let mut h = Harness::new();
|
|
h.app.home.open = false;
|
|
h.app.ui.show_browser = true;
|
|
h.frames(3);
|
|
h
|
|
}
|
|
|
|
fn menu(h: &mut Harness, label: &str) {
|
|
let items = context_menu::items(&h.app, &Target::Section);
|
|
let item = items.iter().find(|i| i.label == label).unwrap_or_else(|| panic!("no {label} in {items:?}")).clone();
|
|
context_menu::run_item(&mut h.app, &item, pos2(0.0, 0.0));
|
|
h.frames(3);
|
|
}
|
|
|
|
#[test]
|
|
fn no_analysis_folder_without_a_section() {
|
|
let h = harness();
|
|
assert!(crate::scenario::handle_at("row:Analysis").is_none());
|
|
assert!(crate::scenario::handle_at("row:Section Analysis").is_none());
|
|
drop(h);
|
|
}
|
|
|
|
#[test]
|
|
fn the_eye_hides_and_shows_the_section_and_delete_removes_it() {
|
|
let mut h = harness();
|
|
h.app.run("inspect.section", json!({"plane": "XZ", "offset": 15})).unwrap();
|
|
h.frames(3);
|
|
let section = h.app.session.section.expect("a section");
|
|
assert!(crate::scenario::handle_at("row:Section Analysis").is_some(), "the section is listed under Analysis");
|
|
|
|
click(&mut h, "eye:Section Analysis");
|
|
assert_eq!(h.app.session.section, None, "the eye turns the section off");
|
|
assert!(crate::scenario::handle_at("row:Section Analysis").is_some(), "a hidden section stays listed");
|
|
|
|
click(&mut h, "eye:Section Analysis");
|
|
let back = h.app.session.section.expect("the eye turns it back on");
|
|
assert!((back.0 - section.0).len() < 1e-9 && (back.1 - section.1).len() < 1e-9, "the same plane: {back:?} vs {section:?}");
|
|
|
|
// The folder's eye is its own: hiding it turns the section off without changing the
|
|
// section's eye, and hiding the section doesn't change the folder's.
|
|
click(&mut h, "eye:Analysis");
|
|
assert_eq!(h.app.session.section, None);
|
|
assert!(h.app.tree.analysis_hidden && !h.app.tree.section_hidden);
|
|
menu(&mut h, "Show/Hide");
|
|
assert!(h.app.session.section.is_none() && h.app.tree.section_hidden, "the menu hides the section itself");
|
|
assert!(h.app.tree.analysis_hidden, "the section's eye doesn't change the folder's");
|
|
click(&mut h, "eye:Analysis");
|
|
assert_eq!(h.app.session.section, None, "the section was hidden on its own meanwhile");
|
|
assert!(!h.app.tree.analysis_hidden);
|
|
menu(&mut h, "Show/Hide");
|
|
assert!(h.app.session.section.is_some(), "Show/Hide in the menu brings it back");
|
|
|
|
menu(&mut h, "Delete");
|
|
assert_eq!(h.app.session.section, None);
|
|
assert!(h.app.tree.hidden_section.is_none());
|
|
assert!(crate::scenario::handle_at("row:Section Analysis").is_none(), "a deleted section leaves the browser");
|
|
}
|
|
|
|
#[test]
|
|
fn deleting_a_hidden_section_forgets_it() {
|
|
let mut h = harness();
|
|
h.app.run("inspect.section", json!({"plane": "XY", "offset": 2})).unwrap();
|
|
h.frames(3);
|
|
click(&mut h, "eye:Section Analysis");
|
|
menu(&mut h, "Delete");
|
|
assert!(h.app.session.section.is_none() && h.app.tree.hidden_section.is_none());
|
|
assert!(crate::scenario::handle_at("row:Analysis").is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn edit_opens_the_section_dialog() {
|
|
let mut h = harness();
|
|
h.app.run("inspect.section", json!({"plane": "YZ"})).unwrap();
|
|
h.frames(3);
|
|
menu(&mut h, "Edit Section Analysis");
|
|
assert!(h.app.dialog.is_some(), "the Section Analysis dialog opens");
|
|
}
|
|
|
|
fn section_dialog(h: &Harness) -> (String, bool, Vec<solidcraft_engine::Sel>) {
|
|
let d = h.app.dialog.as_ref().expect("the Section Analysis dialog");
|
|
let crate::dialogs::Kind::Section { offset, flip } = &d.kind else { panic!("not the section dialog: {:?}", d.kind) };
|
|
(offset.clone(), *flip, d.inputs.first().map(|i| i.items.clone()).unwrap_or_default())
|
|
}
|
|
|
|
fn ok(h: &mut Harness) {
|
|
h.frames(2);
|
|
h.step(&json!({"widget":"OK"})).unwrap();
|
|
h.frames(3);
|
|
assert!(h.app.dialog.is_none(), "OK closes the dialog");
|
|
}
|
|
|
|
/// Editing a section reopens its dialog at the plane and distance it was left at, so the cut
|
|
/// moves on from there instead of jumping back to the plane.
|
|
#[test]
|
|
fn edit_starts_from_the_section_as_it_was_left() {
|
|
let mut h = harness();
|
|
h.app.run("solid.box", json!({"length":40,"width":30,"height":20})).unwrap();
|
|
h.app.session.selection = vec![solidcraft_engine::Sel::Plane { name: "XY".into() }];
|
|
h.app.start("inspect.section");
|
|
if let Some(crate::dialogs::Kind::Section { offset, .. }) = h.app.dialog.as_mut().map(|d| &mut d.kind) {
|
|
*offset = "12 mm".into();
|
|
}
|
|
ok(&mut h);
|
|
let cut = h.app.session.section.expect("a section");
|
|
assert!((cut.0.z - 12.0).abs() < 1e-9, "{cut:?}");
|
|
|
|
// The toolbar starts a new section (in place of this one), not an edit of it.
|
|
h.app.session.selection.clear();
|
|
h.app.start("inspect.section");
|
|
let (offset, _, plane) = section_dialog(&h);
|
|
assert_eq!(offset, "0 mm", "a new section starts at its plane");
|
|
assert!(plane.is_empty(), "a new section picks its own plane: {plane:?}");
|
|
crate::dialogs::cancel(&mut h.app);
|
|
h.frames(2);
|
|
assert!(h.app.session.section.is_some_and(|c| (c.0.z - 12.0).abs() < 1e-9), "cancelling keeps the section");
|
|
|
|
menu(&mut h, "Edit Section Analysis");
|
|
let (offset, flip, plane) = section_dialog(&h);
|
|
assert_eq!((offset.as_str(), flip), ("12 mm", false));
|
|
assert_eq!(plane, vec![solidcraft_engine::Sel::Plane { name: "XY".into() }]);
|
|
crate::dialogs::cancel(&mut h.app);
|
|
h.frames(2);
|
|
|
|
// Hidden and shown again, it is still the section the dialog made.
|
|
click(&mut h, "eye:Section Analysis");
|
|
click(&mut h, "eye:Section Analysis");
|
|
menu(&mut h, "Edit Section Analysis");
|
|
assert_eq!(section_dialog(&h).0, "12 mm");
|
|
crate::dialogs::cancel(&mut h.app);
|
|
h.frames(2);
|
|
|
|
// A section made some other way (here a command) is not the dialog's: Edit starts afresh.
|
|
h.app.run("inspect.section", json!({"plane": "XZ", "offset": 5})).unwrap();
|
|
h.frames(3);
|
|
menu(&mut h, "Edit Section Analysis");
|
|
let (offset, _, plane) = section_dialog(&h);
|
|
assert_eq!(offset, "0 mm");
|
|
assert!(plane.is_empty());
|
|
}
|