With the Thickness box cleared, the dialog sent thickness: "" and the
command refused it ("`thickness` must be a number or an expression"),
shown as a red error with Create Issue. The dialog now makes no command
until a thickness is entered.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -3316,6 +3316,13 @@ fn dialog_commands(app: &SolveApp, d: &Dialog) -> Result<Vec<(String, Value)>, S
|
||||
(ps.first().map(|x| json!(x.0)).unwrap_or(Value::Null), json!(ps.iter().map(|x| x.1).collect::<Vec<_>>()))
|
||||
};
|
||||
let face_points = |i: usize| -> Vec<Value> { sels(d, i).face_points().into_iter().map(pt).collect() };
|
||||
// An empty Thickness is no value to shell with: OK waits for one instead of the command
|
||||
// refusing it with an error that asks for an issue report (#960).
|
||||
if let Kind::Shell { thickness } = &d.kind
|
||||
&& thickness.trim().is_empty()
|
||||
{
|
||||
return Err("enter the thickness".into());
|
||||
}
|
||||
let (cmd, params): (&str, Value) = match &d.kind {
|
||||
Kind::ChatContext => return Err("the chat takes these picks; nothing runs".into()),
|
||||
Kind::Extrude {
|
||||
@@ -5570,3 +5577,30 @@ mod shell_body_tests {
|
||||
assert_eq!(p["body"], json!(upper), "{p}");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod shell_thickness_tests {
|
||||
//! Shell with its Thickness box emptied (#960).
|
||||
|
||||
use super::*;
|
||||
use crate::scenario::Harness;
|
||||
|
||||
#[test]
|
||||
fn an_empty_thickness_makes_no_command() {
|
||||
let mut h = Harness::new();
|
||||
h.app.run("solid.box", json!({"length":20,"width":20,"height":10,"corner":[0,0,0]})).unwrap();
|
||||
h.step(&json!({"call":"ui.view","params":{"view":"top"}})).unwrap();
|
||||
h.settle();
|
||||
h.step(&json!({"start":"solid.shell"})).unwrap();
|
||||
h.step(&json!({"click":{"world":[10,10,10]}})).unwrap();
|
||||
h.frames(2);
|
||||
let d = h.app.dialog.as_ref().expect("the shell dialog");
|
||||
assert_eq!(d.inputs[0].items.len(), 1, "the top face is picked");
|
||||
assert!(dialog_commands(&h.app, d).is_ok(), "2 mm by default");
|
||||
if let Some(Dialog { kind: Kind::Shell { thickness }, .. }) = h.app.dialog.as_mut() {
|
||||
thickness.clear();
|
||||
}
|
||||
let d = h.app.dialog.as_ref().unwrap();
|
||||
assert_eq!(dialog_commands(&h.app, d).err().as_deref(), Some("enter the thickness"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user