sheet.flange refuses the sheet values its rule owns (thickness, K-factor, bend radius, reliefs, hem gap) instead of silently ignoring them, and says to use a rule. Un-ignores the #570 regression test. Fixes #570. Co-authored-by: jonaswre <jonas.wrede@beyondit.gmbh>
This commit is contained in:
1 parent
c727e2d0c2
commit
db02a18627
2 files changed
+17
-2
No files matched your search
@@ -17,7 +17,8 @@ pub static COMMANDS: &[CommandSpec] = &[
|
|||||||
"base: sketch + profiles? (rule?, flip?) | contour: sketch + curves (open chain of lines) + distance (rule?, flip?, reverse?) | \
|
"base: sketch + profiles? (rule?, flip?) | contour: sketch + curves (open chain of lines) + distance (rule?, flip?, reverse?) | \
|
||||||
edge: edges: [[x,y,z] on top/bottom edges, or {point: [x,y,z], angle?, height?} for an edge with its own angle and height] + \
|
edge: edges: [[x,y,z] on top/bottom edges, or {point: [x,y,z], angle?, height?} for an edge with its own angle and height] + \
|
||||||
height (to the outer face), angle? (default 90 deg), radius? (default: rule), \
|
height (to the outer face), angle? (default 90 deg), radius? (default: rule), \
|
||||||
position?: inside|outside|middle, flip?, body?; type?: base|edge|contour (default from the inputs); name?, body_name? (the new body)",
|
position?: inside|outside|middle, flip?, body?; type?: base|edge|contour (default from the inputs); name?, body_name? (the new body). \
|
||||||
|
Thickness, K-factor and bend radius come from the rule (sheet.manage_rules); passing them here is refused",
|
||||||
),
|
),
|
||||||
CommandSpec::new("sheet.hem", "Hem", hem)
|
CommandSpec::new("sheet.hem", "Hem", hem)
|
||||||
.at("SHEET METAL", "CREATE")
|
.at("SHEET METAL", "CREATE")
|
||||||
@@ -105,8 +106,23 @@ fn rule_param(s: &Session, p: &Value, cmd: &str) -> Result<Option<String>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Sheet values a flange takes from its rule. Passing one to `sheet.flange` is refused rather
|
||||||
|
/// than ignored, so a script never gets a part of another thickness than it asked for.
|
||||||
|
const RULE_ONLY: [&str; 8] =
|
||||||
|
["thickness", "k_factor", "bend_radius", "relief_width", "relief_depth", "corner_relief", "corner_relief_shape", "hem_gap"];
|
||||||
|
|
||||||
fn flange(s: &mut Session, p: &Value) -> Result<Value> {
|
fn flange(s: &mut Session, p: &Value) -> Result<Value> {
|
||||||
let cmd = "sheet.flange";
|
let cmd = "sheet.flange";
|
||||||
|
let nested = p.get("base").filter(|b| b.is_object());
|
||||||
|
if let Some(key) = RULE_ONLY.iter().find(|k| p.get(**k).is_some() || nested.is_some_and(|b| b.get(**k).is_some())) {
|
||||||
|
return Err(bad(
|
||||||
|
cmd,
|
||||||
|
format!(
|
||||||
|
"`{key}` is not a sheet.flange parameter: the sheet metal rule sets it. Make a rule with \
|
||||||
|
sheet.manage_rules {{name, {key}, …}} and pass its name as `rule`"
|
||||||
|
),
|
||||||
|
));
|
||||||
|
}
|
||||||
let ty = match str_(p, "type") {
|
let ty = match str_(p, "type") {
|
||||||
Some(t) => t.to_ascii_lowercase(),
|
Some(t) => t.to_ascii_lowercase(),
|
||||||
None if p.get("edges").is_some() => "edge".into(),
|
None if p.get("edges").is_some() => "edge".into(),
|
||||||
|
|||||||
@@ -2562,7 +2562,6 @@ fn flat_pattern_reports_a_round_hole_as_a_circle() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore = "fails until #570 is fixed"]
|
|
||||||
fn a_flange_asked_for_0_8_mm_is_0_8_mm_or_refused_never_silently_2_5_mm() {
|
fn a_flange_asked_for_0_8_mm_is_0_8_mm_or_refused_never_silently_2_5_mm() {
|
||||||
// `thickness` on sheet.flange may become an inline override of the rule, or be refused as
|
// `thickness` on sheet.flange may become an inline override of the rule, or be refused as
|
||||||
// an unknown parameter; either is fine. Building the default 2.5 mm sheet silently is not.
|
// an unknown parameter; either is fine. Building the default 2.5 mm sheet silently is not.
|
||||||
|
|||||||
Reference in new issue
Block a user