Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Sketch: show no geometry for an empty sketch (#9077) (#9104)

Colin Faulkingham079f6e61e631
diff --git a/crates/ui-egui/src/shell_tests.rs b/crates/ui-egui/src/shell_tests.rs
index 9315908e8a..f1ea980a26 100644
--- a/crates/ui-egui/src/shell_tests.rs
+++ b/crates/ui-egui/src/shell_tests.rs
@@ -1013,6 +1013,33 @@ fn status_bar_spans_the_window_below_history_in_both_layouts_and_is_covered() {
}
}
+#[test]
+fn viewport_sketch_status_distinguishes_empty_and_constrained_geometry() {
+ for mode in [LayoutMode::Docked, LayoutMode::Floating] {
+ let mut h = Harness::new();
+ h.call("ui.set", json!({"layout":mode}));
+ let corner = |h: &Harness| painted_texts(h).into_iter().filter(|t| t.starts_with("Sketch1 — ")).collect::<Vec<_>>();
+ h.app.run("sketch.create", json!({"plane":"XY"})).unwrap();
+ h.settle();
+ assert_eq!(corner(&h), ["Sketch1 — No geometry yet"], "{mode:?}: an empty sketch is not fully constrained");
+ assert!(h.widget("No geometry yet").is_some(), "the palette agrees with the viewport");
+
+ let rectangle = h.app.run("sketch.rectangle.two_point", json!({"p0":[0,0],"p1":[40,30]})).unwrap();
+ h.settle();
+ assert_eq!(corner(&h), ["Sketch1 — 2 degrees of freedom"], "the rectangle's width and height are free");
+ h.app.run("sketch.constraint.fix", json!({"entities":rectangle["curves"]})).unwrap();
+ h.settle();
+ assert_eq!(corner(&h), ["Sketch1 — fully constrained"], "drawn geometry can be fully constrained");
+
+ h.app.run("edit.undo", json!({})).unwrap();
+ h.settle();
+ assert_eq!(corner(&h), ["Sketch1 — 2 degrees of freedom"]);
+ h.app.run("edit.undo", json!({})).unwrap();
+ h.settle();
+ assert_eq!(corner(&h), ["Sketch1 — No geometry yet"], "undoing the geometry restores the empty status");
+ }
+}
+
#[test]
fn status_bar_names_what_is_edited_and_the_sketch_state_and_replaces_the_views_corner_text() {
use crate::status_bar::SketchState;
@@ -1020,7 +1047,7 @@ fn status_bar_names_what_is_edited_and_the_sketch_state_and_replaces_the_views_c
let corner = |h: &Harness| painted_texts(h).into_iter().filter(|t| t.starts_with("Sketch1 — ")).collect::<Vec<_>>();
h.app.run("sketch.create", json!({"plane":"XY"})).unwrap();
h.settle();
- assert_eq!(corner(&h), ["Sketch1 — fully constrained"], "without the bar the state stays in the view's corner");
+ assert_eq!(corner(&h), ["Sketch1 — No geometry yet"], "without the bar the state stays in the view's corner");
h.call("ui.prefs", json!({"status_bar": true}));
h.settle();
let contents = crate::status_bar::contents(&h.app);
diff --git a/crates/ui-egui/src/viewport.rs b/crates/ui-egui/src/viewport.rs
index 6bac2b54cb..07d32f0233 100644
--- a/crates/ui-egui/src/viewport.rs
+++ b/crates/ui-egui/src/viewport.rs
@@ -5896,6 +5896,8 @@ fn overlays(app: &SolveApp, painter: &egui::Painter, proj: &Proj) {
if let Some(r) = app.viewport.layout.as_ref().map(|l| l.content).filter(|_| !crate::status_bar::shown(app)) {
let status = if !ss.report.ok() {
crate::i18n::tr("sketch.status_conflict").to_string()
+ } else if !crate::sketch_palette::has_geometry(sk) {
+ crate::i18n::tr("ui.no_geometry_yet").to_string()
} else if ss.report.dof == 0 {
crate::i18n::tr("sketch.status_fully_constrained").to_string()
} else if ss.report.dof == 1 {