Tools: the Spiral and Arc tools refuse the values they would keep as others

The Spiral tool's option check took a decay up to 150 while the tool keeps
at most 99.99, so `tool.setOption` reported success with another value. It
now takes 5 to 99.99. The Arc tool's lengths are checked from 1e-9 to 1e6,
the lengths it keeps. The Spiral dialog sends a typed decay past 99.99 as
99.99, the decay the spiral was already drawn with.

The Arc dialog test now expects OK to refuse a slope outside -100 to 100
and a Base Along other than X or Y, leaving the dialog open and the options
unchanged. The Slope field and its slider keep a typed value within that
range.
This commit is contained in:
dotCooCoo
2026-11-17 08:55:24 -08:00
parent a8b658a33e
commit 22d44c6fae
3 changed files with 60 additions and 17 deletions
+6 -1
View File
@@ -246,7 +246,12 @@ fn spiral_decay_is_normalized_for_active_and_inactive_tools_and_preferences() {
let mut s = session();
for active in [false, true] {
select(&mut s, if active { "spiral" } else { "selection" });
let options = s.set_tool_option_cmd(&json!({"tool": "spiral", "values": {"decay": 150, "segments": 4, "clockwise": false}})).unwrap();
// A decay past the 99.99 % a spiral draws is refused, and nothing changes.
let before = s.tool_options_of("spiral");
let refused = s.set_tool_option_cmd(&json!({"tool": "spiral", "values": {"decay": 150, "segments": 4, "clockwise": false}}));
assert_eq!(refused.err(), Some("tool `spiral`: `decay` must be a number from 5 to 99.99".to_string()));
assert_eq!(s.tool_options_of("spiral"), before);
let options = s.set_tool_option_cmd(&json!({"tool": "spiral", "values": {"decay": 99.99, "segments": 4, "clockwise": false}})).unwrap();
assert_eq!(options["decay"], json!(99.99));
assert_eq!(s.tool_options_of("spiral")["decay"], json!(99.99));
assert_eq!(s.prefs.tool_settings["spiral"]["decay"], json!(99.99));
+26 -3
View File
@@ -519,11 +519,12 @@ impl Tool for FamilyTool {
}
let skew = vectorcraft_geom::shapes::GRID_SKEW_MAX;
match key {
"lengthX" | "lengthY" | "width" | "height" => c::positive(key, v, 1e6),
"lengthX" | "lengthY" => c::number(key, v, 1e-9, 1e6),
"width" | "height" => c::positive(key, v, 1e6),
"reference" => c::whole(key, v, 0, 8),
"baseAlong" => c::one_of(key, v, &["x", "y", "X", "Y"]),
"slope" => c::number(key, v, -100.0, 100.0),
"decay" => c::number(key, v, 5.0, 150.0),
"decay" => c::number(key, v, 5.0, 99.99),
"segments" => c::whole(key, v, 2, 1000),
"rows" | "concentric" | "columns" | "radial" => c::whole(key, v, 0, 999),
"rowSkew" | "concentricSkew" | "columnSkew" | "radialSkew" => c::number(key, v, -skew, skew),
@@ -532,7 +533,7 @@ impl Tool for FamilyTool {
}
}
/// Arc segment length from a dialog or preference value, at most 1e6 pt (as the option check
/// Arc segment length from a dialog or preference value, from 1e-9 to 1e6 pt (as the option check
/// takes it).
fn arc_length(v: &Value, current: f64) -> f64 {
v.as_f64().filter(|n| n.is_finite()).map_or(current, |n| n.abs().clamp(1e-9, 1e6))
@@ -580,6 +581,28 @@ mod tests {
}
}
/// A number `tool.setOption` takes is kept as given, and a number the tool would keep as
/// another value is refused: `decay` past 99.99 is an error.
#[test]
fn family_tools_keep_the_numbers_their_option_check_takes() {
let tries = [-1e9, -150.0, -100.0, -1.0, 0.0, 1e-12, 0.5, 1.0, 2.0, 5.0, 8.0, 99.99, 100.0, 120.0, 150.0, 999.0, 1000.0, 1e6, 1e9];
for id in ["arc", "spiral", "rectangularGrid", "polarGrid"] {
let defaults = FamilyTool::new(id).options();
for (k, _) in defaults.as_object().into_iter().flatten().filter(|(_, v)| v.is_number()) {
for n in tries {
let mut t = FamilyTool::new(id);
if t.check_option(k, &json!(n)).is_ok() {
t.set_option(k, &json!(n));
assert_eq!(t.options()[k].as_f64(), Some(n), "{id} `{k}` = {n}");
}
}
}
}
let t = FamilyTool::new("spiral");
assert_eq!(t.check_option("decay", &json!(120.0)).err(), Some("`decay` must be a number from 5 to 99.99".into()));
assert!(t.check_option("decay", &json!(99.99)).is_ok());
}
#[test]
fn normalized_spiral_decay_preserves_existing_capped_paths_within_roundoff() {
for requested in [100.0, 150.0] {
+28 -13
View File
@@ -270,8 +270,8 @@ fn arc_form(ui: &mut egui::Ui, d: &mut Dialog, unit: Unit) {
const ARC_PREVIEW: egui::Vec2 = egui::vec2(160.0, 120.0);
const ARC_PREVIEW_MARGIN: f32 = 12.0;
/// The arc the Arc tool draws with the options OK sets from `d` ([`arc_options`], kept as the tool
/// keeps them: a slope from -100 to 100, a Base Along of Y or else X), as `shape.arc` draws it
/// The arc the Arc tool draws with the options OK sets from `d` ([`arc_options`]; a slope past -100
/// or 100, which OK refuses, is drawn at that end, and a Base Along other than Y along X), as `shape.arc` draws it
/// with its reference point at the origin and General › Constrain Angle `constrain` (degrees)
/// turning it about that point. `None` when a length or the slope is not finite.
fn arc_preview_path(d: &Dialog, constrain: f64) -> Option<vectorcraft_geom::path::PathData> {
@@ -523,7 +523,7 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
"cx": x,
"cy": y,
"radius": d.f64("radius", 50.0).max(0.01),
"decay": d.f64("decay", 80.0).clamp(5.0, 150.0),
"decay": d.f64("decay", 80.0).clamp(5.0, 99.99),
"segments": (d.f64("segments", 10.0) as u64).clamp(2, 1000),
"clockwise": d.bool("clockwise"),
}),
@@ -646,6 +646,15 @@ mod tests {
assert!(app.ui.dialog.is_none());
assert_eq!(app.session.doc().unwrap().doc.layers[0].children().unwrap().len(), 1);
assert_eq!(app.session.tool_options_of("spiral"), json!({"decay": 65.0, "segments": 12, "clockwise": true}));
// A decay typed past 99.99 % draws the spiral at 99.99 %, the most a spiral draws, and
// keeps that decay.
super::super::open_tool_dialog(&mut app, "spiral", json!({"x": 40.0, "y": 60.0}));
app.ui.dialog.as_mut().unwrap().fields.insert("decay".into(), json!(120.0));
super::super::confirm(&mut app).unwrap();
assert!(app.ui.dialog.is_none());
assert_eq!(app.session.doc().unwrap().doc.layers[0].children().unwrap().len(), 2);
assert_eq!(app.session.tool_options_of("spiral")["decay"], json!(99.99));
}
#[test]
@@ -731,21 +740,27 @@ mod tests {
}
}
/// For values the Arc tool does not keep as typed, the picture shows the arc of the options OK
/// sets: the same picture as a dialog holding those options.
/// For values the dialog reads as other values, the picture shows the arc of the options OK
/// sets: the same picture as a dialog holding those options. A slope outside -100 to 100 or a
/// Base Along other than X or Y is refused: OK leaves the dialog open and keeps the options.
#[test]
fn the_arc_preview_shows_the_options_ok_sets() {
let mut app = VectorcraftApp::new(Session::new(), Default::default());
app.run("file.new", json!({"width": 300, "height": 300})).unwrap();
for typed in [
json!({"slope": 140.0}),
json!({"slope": -250.0}),
json!({"slope": "steep"}),
json!({"lengthX": "wide"}),
json!({"lengthY": null}),
json!({"baseAlong": "z"}),
json!({"reference": 12}),
for (typed, error) in [
(json!({"slope": 140.0}), "`slope` must be a number from -100 to 100"),
(json!({"slope": -250.0}), "`slope` must be a number from -100 to 100"),
(json!({"baseAlong": "z"}), "`baseAlong` must be one of"),
] {
let before = app.session.tool_options_of("arc");
app.ui.dialog = Some(arc_dialog(typed.clone()));
let r = super::super::confirm(&mut app);
assert!(r.as_ref().is_err_and(|e| e.contains(error)), "{typed}: {r:?}");
assert!(app.ui.dialog.is_some(), "{typed}");
assert_eq!(app.session.tool_options_of("arc"), before, "{typed}");
app.ui.dialog = None;
}
for typed in [json!({"slope": "steep"}), json!({"lengthX": "wide"}), json!({"lengthY": null}), json!({"reference": 12})] {
let d = arc_dialog(typed.clone());
let shown = arc_preview_path(&d, 0.0).expect("an arc");
app.ui.dialog = Some(d);