mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-18 08:53:33 +00:00
Merge main into feat/unembed-several-images
This commit is contained in:
@@ -893,6 +893,10 @@ pub use buildcmds::live_paint_gaps;
|
||||
/// Control bar enable it when it changes one).
|
||||
pub use brushsym::reset_transformation_changes;
|
||||
|
||||
/// The Symbols panel's current symbol, as `symbol.list` answers it (the panel reads it on every
|
||||
/// frame without running the command).
|
||||
pub use brushsym::current_symbol;
|
||||
|
||||
/// The byte order of UTF-16 text without a byte-order mark, by Import Data Sets' rule (the Graph
|
||||
/// Data window reads files by it too).
|
||||
pub use variablecmds::utf16_order_without_mark;
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
//! Packaging Tools (`addon.packaging.*`), a built-in add-on for the dielines of boxes and other
|
||||
//! folded packaging. A path is a fold line when its top stroke is painted with the swatch of a line
|
||||
//! role: Cut, Crease, Partial Cut or Perforation ([`roles`]). The document's role table maps each
|
||||
//! role to its swatch, so every format that keeps the stroke's swatch keeps the role. Its submenu
|
||||
//! role to its swatch, so every format that keeps the stroke's swatch keeps the role. Check Fold
|
||||
//! Lines ([`check`]) finds the panels and hinges the lines make and what is wrong with them. Its submenu
|
||||
//! (Object › Plug-ins › Packaging Tools) and its Fold Lines panel are the UI's.
|
||||
|
||||
mod check;
|
||||
mod roles;
|
||||
|
||||
pub(crate) use roles::{role_swatch_edited, role_swatches_merged};
|
||||
@@ -11,7 +13,9 @@ pub(crate) use roles::{role_swatch_edited, role_swatches_merged};
|
||||
use super::super::CommandSpec;
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
roles::specs()
|
||||
let mut v = roles::specs();
|
||||
v.extend(check::specs());
|
||||
v
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
//! Check Fold Lines (`addon.packaging.check`): the blanks the fold lines make, their panels and
|
||||
//! hinges, and what is wrong with the lines, found by [`vectorcraft_three_d::fold::blanks`].
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{Document, Node, NodeId, NodeKind};
|
||||
use vectorcraft_geom::PathData;
|
||||
use vectorcraft_three_d::fold::{FoldLine, IssueCode, LineKind, MAX_SEGMENTS, blanks};
|
||||
|
||||
use super::super::super::pathops::length_given;
|
||||
use super::super::super::{CommandSpec, bad, checked_ids_or_selection, cmd, has_doc, switch_or};
|
||||
use super::roles::{Role, RoleTable, can_carry, role_targets};
|
||||
use crate::{Result, Session};
|
||||
|
||||
const CHECK: &str = "addon.packaging.check";
|
||||
|
||||
/// How far apart the ends of two lines may be and still be joined, in points.
|
||||
const TOLERANCE: (f64, f64, f64) = (0.01, 0.1, 10.0);
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![cmd!(
|
||||
"addon.packaging.check",
|
||||
"Check Fold Lines",
|
||||
["Object", "Plug-ins", "Packaging Tools"],
|
||||
None,
|
||||
"{ids?: [id…] (default: the selection), select?: bool (false), tolerance?: pt 0.01..10 (0.1)} check the fold lines (addon.packaging.roles) among the objects (through groups and clip groups), or, while nothing is selected and ids is left out, every fold line of the document; hidden lines are left out, also in a selected group. Cut lines bound the blanks: each connected piece of them that encloses material is one blank, its outline is its largest closed cut line, and a closed cut line inside it is a hole, so a slot drawn as a rectangle across the outline leaves the same material as a notch drawn in it; open cut lines that meet end to end count as one closed cut line. Crease, Partial Cut and Perforation lines divide a blank into panels; the pieces of them between two panels are that pair's hinge. A cut line end that comes within tolerance of another cut line is joined to it. Issues, in this order: noCut, open, looseEnd (errors), gap (a warning: the gap is closed), tooComplex (an error: more than 65,536 segments or 256 panels in a blank), cutOverCrease (an error), duplicate (two cut lines, or two lines that fold of any role), danglingCrease, noSplit, outside (wholly, or in part for tolerance or more), notStraight (a hinge's pieces are not on one straight line), sliver, ambiguous, loosePanel (joined to the largest panel by no chain of hinges), nonPrinting (warnings). With select, the objects the issues name become the selection, unless no issue names one. Changes nothing in the document → {ok (no error), blanks, panels, hinges, holes, issues: [{severity: error|warning, code, message (English), ids, at?: [x, y]}], scope: ids|selection|document}",
|
||||
has_doc,
|
||||
check
|
||||
)]
|
||||
}
|
||||
|
||||
/// The English message for an issue (the Fold Lines panel shows it in the interface language).
|
||||
fn message(code: IssueCode, scope: &str) -> &'static str {
|
||||
match code {
|
||||
IssueCode::NoCut if scope == "document" => "No cut lines are in the document.",
|
||||
IssueCode::NoCut if scope == "ids" => "No cut lines are among the given objects.",
|
||||
IssueCode::NoCut => "No cut lines are in the selection.",
|
||||
IssueCode::Open => "The cut lines do not enclose an area.",
|
||||
IssueCode::LooseEnd => "A cut line ends without meeting another cut line.",
|
||||
IssueCode::Gap => "A gap between cut lines was closed.",
|
||||
IssueCode::TooComplex => "The fold lines are too complex to check.",
|
||||
IssueCode::CutOverCrease => "A cut line and a crease lie on top of each other.",
|
||||
IssueCode::Duplicate => "Two fold lines lie on top of each other.",
|
||||
IssueCode::DanglingCrease => "A crease ends inside a panel.",
|
||||
IssueCode::NoSplit => "A crease does not divide two panels.",
|
||||
IssueCode::Outside => "A crease lies outside the cut outline, wholly or in part.",
|
||||
IssueCode::NotStraight => "The pieces of a hinge are not on one straight line.",
|
||||
IssueCode::Sliver => "A gap between cut lines is too narrow to tell apart.",
|
||||
IssueCode::Ambiguous => "A cut-out area holds other fold lines or another blank.",
|
||||
IssueCode::LoosePanel => "A panel is not joined to the rest by a crease.",
|
||||
IssueCode::NonPrinting => "A fold line is on a non-printing layer.",
|
||||
}
|
||||
}
|
||||
|
||||
/// Every object of the document that can carry a role and is shown: on a shown layer, in shown
|
||||
/// groups, and shown itself.
|
||||
fn shown_targets(d: &Document) -> Vec<NodeId> {
|
||||
fn walk(n: &Node, out: &mut Vec<NodeId>) {
|
||||
if !n.visible {
|
||||
return;
|
||||
}
|
||||
match &n.kind {
|
||||
NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } => children.iter().for_each(|c| walk(c, out)),
|
||||
_ if can_carry(n) => out.push(n.id),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
let mut out = vec![];
|
||||
d.layers.iter().for_each(|l| walk(l, &mut out));
|
||||
out
|
||||
}
|
||||
|
||||
/// The path of object `n` in document coordinates: a path's own, or a compound path's members'.
|
||||
fn path_of(n: &Node) -> Option<PathData> {
|
||||
match &n.kind {
|
||||
NodeKind::Path { path, .. } => Some(path.clone()),
|
||||
NodeKind::Compound { children, .. } => Some(PathData::new(
|
||||
children
|
||||
.iter()
|
||||
.filter_map(|c| match &c.kind {
|
||||
NodeKind::Path { path, .. } => Some(path.subpaths.iter().cloned()),
|
||||
_ => None,
|
||||
})
|
||||
.flatten()
|
||||
.collect(),
|
||||
)),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether object `id` is on a layer, or a sublayer, that does not print.
|
||||
fn on_non_printing_layer(d: &Document, id: NodeId) -> bool {
|
||||
d.ancestry(id).unwrap_or_default().iter().filter_map(|a| d.node(*a)).any(|n| matches!(n.kind, NodeKind::Layer { printable: false, .. }))
|
||||
}
|
||||
|
||||
fn kind(role: Role) -> LineKind {
|
||||
match role {
|
||||
Role::Cut => LineKind::Cut,
|
||||
Role::Crease => LineKind::Crease,
|
||||
Role::PartialCut => LineKind::PartialCut,
|
||||
Role::Perforation => LineKind::Perforation,
|
||||
}
|
||||
}
|
||||
|
||||
fn check(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let select = switch_or(p, "select", false, CHECK)?;
|
||||
let tolerance = match length_given(p, "tolerance", CHECK)? {
|
||||
None => TOLERANCE.1,
|
||||
Some(t) if (TOLERANCE.0..=TOLERANCE.2).contains(&t) => t,
|
||||
Some(_) => return Err(bad(CHECK, format!("`tolerance` must be from {} to {} pt", TOLERANCE.0, TOLERANCE.2))),
|
||||
};
|
||||
let given = p.get("ids").is_some_and(|v| !v.is_null());
|
||||
let roots = checked_ids_or_selection(s, p, CHECK)?;
|
||||
let d = &s.doc()?.doc;
|
||||
// Hidden lines are left out in every scope, members of a selected group included.
|
||||
let shown = |ids: Vec<NodeId>| ids.into_iter().filter(|id| d.is_visible(*id)).collect::<Vec<_>>();
|
||||
let (scope, targets) = match (given, roots.is_empty()) {
|
||||
(true, _) => ("ids", shown(role_targets(d, &roots, false).0)),
|
||||
(false, false) => ("selection", shown(role_targets(d, &roots, false).0)),
|
||||
(false, true) => ("document", shown_targets(d)),
|
||||
};
|
||||
let table = RoleTable::of(d);
|
||||
let mut lines = vec![];
|
||||
let mut non_printing = vec![];
|
||||
let mut segments = 0usize;
|
||||
for id in targets {
|
||||
// Once the lines have more segments than the check takes, it reports them as too complex:
|
||||
// the rest are not copied.
|
||||
if segments > MAX_SEGMENTS {
|
||||
break;
|
||||
}
|
||||
let Some(n) = d.node(id) else { continue };
|
||||
let (Some(role), Some(path)) = (table.role_of(n), path_of(n)) else { continue };
|
||||
if on_non_printing_layer(d, id) {
|
||||
non_printing.push(id.0);
|
||||
}
|
||||
segments = segments.saturating_add(path.subpaths.iter().map(|sp| sp.segment_count()).sum());
|
||||
lines.push(FoldLine { path, kind: kind(role), key: id.0 });
|
||||
}
|
||||
let (found, mut issues) = blanks(&lines, tolerance);
|
||||
if !non_printing.is_empty() {
|
||||
issues.push(vectorcraft_three_d::fold::Issue { code: IssueCode::NonPrinting, keys: non_printing, at: None });
|
||||
}
|
||||
let ok = !issues.iter().any(|i| i.code.is_error());
|
||||
let rows: Vec<Value> = issues
|
||||
.iter()
|
||||
.map(|i| {
|
||||
let mut row = json!({
|
||||
"severity": if i.code.is_error() { "error" } else { "warning" },
|
||||
"code": i.code.id(),
|
||||
"message": message(i.code, scope),
|
||||
"ids": i.keys,
|
||||
});
|
||||
if let (Some(at), Some(o)) = (i.at, row.as_object_mut()) {
|
||||
o.insert("at".into(), json!([at.x, at.y]));
|
||||
}
|
||||
row
|
||||
})
|
||||
.collect();
|
||||
if select {
|
||||
let mut ids: Vec<NodeId> = issues.iter().flat_map(|i| i.keys.iter().map(|k| NodeId(*k))).filter(|id| d.node(*id).is_some()).collect();
|
||||
ids.sort_unstable_by_key(|id| id.0);
|
||||
ids.dedup();
|
||||
if !ids.is_empty() {
|
||||
s.select(|_, sel| sel.set(ids.iter().copied()))?;
|
||||
}
|
||||
}
|
||||
Ok(json!({
|
||||
"ok": ok,
|
||||
"blanks": found.len(),
|
||||
"panels": found.iter().map(|b| b.panels.len()).sum::<usize>(),
|
||||
"hinges": found.iter().map(|b| b.hinges.len()).sum::<usize>(),
|
||||
"holes": found.iter().map(|b| b.holes.len()).sum::<usize>(),
|
||||
"issues": rows,
|
||||
"scope": scope,
|
||||
}))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
@@ -0,0 +1,180 @@
|
||||
//! Tests for Check Fold Lines: the blanks, panels, hinges and issues of fold lines drawn in a
|
||||
//! document.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use crate::*;
|
||||
|
||||
fn session() -> Session {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 600, "height": 600})).unwrap();
|
||||
s
|
||||
}
|
||||
|
||||
fn path(s: &mut Session, d: &str) -> u64 {
|
||||
s.execute("path.create", &json!({ "d": d })).unwrap()["id"].as_u64().unwrap()
|
||||
}
|
||||
|
||||
fn role(s: &mut Session, role: &str, ids: &[u64]) {
|
||||
s.execute("addon.packaging.setRole", &json!({ "role": role, "ids": ids })).unwrap();
|
||||
}
|
||||
|
||||
fn check(s: &mut Session, p: Value) -> Value {
|
||||
s.execute("addon.packaging.check", &p).unwrap()
|
||||
}
|
||||
|
||||
fn codes(r: &Value) -> Vec<&str> {
|
||||
r["issues"].as_array().unwrap().iter().map(|i| i["code"].as_str().unwrap()).collect()
|
||||
}
|
||||
|
||||
/// A tray blank: a 100 pt base with a 40 pt wall on each side, its outline a cut line and the
|
||||
/// base's four sides creases → (outline, creases).
|
||||
fn tray(s: &mut Session) -> (u64, Vec<u64>) {
|
||||
let outline = path(s, "M140 100 L240 100 L240 140 L280 140 L280 240 L240 240 L240 280 L140 280 L140 240 L100 240 L100 140 L140 140 Z");
|
||||
let creases = vec![path(s, "M140 140 L240 140"), path(s, "M240 140 L240 240"), path(s, "M240 240 L140 240"), path(s, "M140 240 L140 140")];
|
||||
role(s, "cut", &[outline]);
|
||||
role(s, "crease", &creases);
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
(outline, creases)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_tray_checks_clean_with_five_panels_and_four_hinges() {
|
||||
let mut s = session();
|
||||
tray(&mut s);
|
||||
let steps = s.doc().unwrap().history.undo.len();
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!(r["ok"], true, "{r}");
|
||||
assert_eq!((r["blanks"].as_u64(), r["panels"].as_u64(), r["hinges"].as_u64(), r["holes"].as_u64()), (Some(1), Some(5), Some(4), Some(0)), "{r}");
|
||||
assert!(codes(&r).is_empty(), "{r}");
|
||||
assert_eq!(r["scope"], "document");
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), steps, "a check records no undo step");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_selection_or_ids_limit_the_check_to_their_lines() {
|
||||
let mut s = session();
|
||||
let (outline, creases) = tray(&mut s);
|
||||
s.execute("select.set", &json!({ "ids": [creases[0]] })).unwrap();
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!((r["scope"].as_str(), r["ok"].as_bool()), (Some("selection"), Some(false)));
|
||||
assert_eq!(codes(&r), ["noCut"]);
|
||||
assert_eq!(r["issues"][0]["message"], "No cut lines are in the selection.");
|
||||
let r = check(&mut s, json!({ "ids": [outline] }));
|
||||
assert_eq!((r["scope"].as_str(), r["ok"].as_bool(), r["panels"].as_u64()), (Some("ids"), Some(true), Some(1)), "{r}");
|
||||
let r = check(&mut s, json!({ "ids": [creases[1]] }));
|
||||
assert_eq!((r["scope"].as_str(), codes(&r)), (Some("ids"), vec!["noCut"]));
|
||||
assert_eq!(r["issues"][0]["message"], "No cut lines are among the given objects.");
|
||||
// No fold lines at all in the document.
|
||||
let mut s = session();
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!(codes(&r), ["noCut"]);
|
||||
assert_eq!(r["issues"][0]["message"], "No cut lines are in the document.");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn issues_name_their_lines_and_select_selects_them() {
|
||||
let mut s = session();
|
||||
let (_, creases) = tray(&mut s);
|
||||
// A slit from the outline that stops in the middle of the base.
|
||||
let slit = path(&mut s, "M190 100 L190 190");
|
||||
role(&mut s, "cut", &[slit]);
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!(r["ok"], false);
|
||||
let loose = r["issues"].as_array().unwrap().iter().find(|i| i["code"] == "looseEnd").cloned().unwrap();
|
||||
assert_eq!((loose["severity"].as_str(), loose["ids"].clone()), (Some("error"), json!([slit])), "{r}");
|
||||
assert_eq!(loose["at"], json!([190.0, 190.0]));
|
||||
assert!(s.doc().unwrap().selection.objects.is_empty(), "without select, the selection stays");
|
||||
let r = check(&mut s, json!({ "select": true }));
|
||||
let named: std::collections::BTreeSet<u64> =
|
||||
r["issues"].as_array().unwrap().iter().flat_map(|i| i["ids"].as_array().unwrap().iter().map(|v| v.as_u64().unwrap())).collect();
|
||||
let selected: std::collections::BTreeSet<u64> = s.doc().unwrap().selection.objects.iter().map(|id| id.0).collect();
|
||||
assert!(selected.contains(&slit) && selected == named, "{selected:?} {named:?}");
|
||||
assert!(!selected.contains(&creases[1]));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_clean_check_with_select_leaves_the_selection_alone() {
|
||||
let mut s = session();
|
||||
let (outline, _) = tray(&mut s);
|
||||
s.execute("select.set", &json!({ "ids": [outline] })).unwrap();
|
||||
let r = check(&mut s, json!({ "ids": [outline], "select": true }));
|
||||
assert!(codes(&r).is_empty(), "{r}");
|
||||
assert_eq!(s.doc().unwrap().selection.objects.iter().map(|id| id.0).collect::<Vec<_>>(), [outline]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tolerance_is_checked_and_joins_gaps_up_to_it() {
|
||||
let mut s = session();
|
||||
tray(&mut s);
|
||||
for bad in [json!(0.005), json!(10.5), json!("x"), json!(true)] {
|
||||
let e = s.execute("addon.packaging.check", &json!({ "tolerance": bad })).unwrap_err().to_string();
|
||||
assert!(e.contains("tolerance"), "{e}");
|
||||
}
|
||||
let e = s.execute("addon.packaging.check", &json!({ "select": 1 })).unwrap_err().to_string();
|
||||
assert!(e.contains("select"), "{e}");
|
||||
for edge in [json!(0.01), json!(10), json!("2 mm")] {
|
||||
assert_eq!(check(&mut s, json!({ "tolerance": edge }))["ok"], true);
|
||||
}
|
||||
// A slit that stops 0.5 pt short of a crease: a gap at a tolerance of 1 pt, a loose end at 0.1 pt.
|
||||
let mut s = session();
|
||||
tray(&mut s);
|
||||
let slit = path(&mut s, "M190 100 L190 139.5");
|
||||
role(&mut s, "cut", &[slit]);
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
assert!(codes(&check(&mut s, json!({ "tolerance": 0.1 }))).contains(&"looseEnd"));
|
||||
let near = check(&mut s, json!({ "tolerance": 1 }));
|
||||
assert!(!codes(&near).contains(&"looseEnd"), "{near}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hidden_lines_are_left_out_and_lines_on_a_non_printing_layer_are_noted() {
|
||||
let mut s = session();
|
||||
let (_, creases) = tray(&mut s);
|
||||
// A hidden crease is not checked while nothing is selected: the tray has three hinges and a
|
||||
// panel joined by none.
|
||||
s.execute("layer.setProps", &json!({ "ids": [creases[0]], "visible": false })).unwrap();
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!((r["panels"].as_u64(), r["hinges"].as_u64()), (Some(4), Some(3)), "{r}");
|
||||
// The same in a selected group, and with the group named by `ids`: the hidden member is left
|
||||
// out too.
|
||||
let mut s = session();
|
||||
let (outline, creases) = tray(&mut s);
|
||||
s.execute("select.set", &json!({ "ids": [outline, creases[0], creases[1], creases[2], creases[3]] })).unwrap();
|
||||
let group = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
|
||||
s.execute("layer.setProps", &json!({ "ids": [creases[0]], "visible": false })).unwrap();
|
||||
s.execute("select.set", &json!({ "ids": [group] })).unwrap();
|
||||
for p in [json!({}), json!({ "ids": [group] })] {
|
||||
let r = check(&mut s, p);
|
||||
assert_eq!((r["panels"].as_u64(), r["hinges"].as_u64()), (Some(4), Some(3)), "{r}");
|
||||
}
|
||||
// A cut line on a layer that does not print.
|
||||
let mut s = session();
|
||||
s.execute("layer.new", &json!({ "printable": false })).unwrap();
|
||||
let (outline, _) = tray(&mut s);
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!(r["ok"], true, "a warning only");
|
||||
let note = r["issues"].as_array().unwrap().iter().find(|i| i["code"] == "nonPrinting").cloned().unwrap();
|
||||
assert_eq!(note["severity"], "warning");
|
||||
assert!(note["ids"].as_array().unwrap().contains(&json!(outline)), "{note}");
|
||||
assert_eq!(note["message"], "A fold line is on a non-printing layer.");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_compound_path_and_a_grouped_line_are_checked() {
|
||||
let mut s = session();
|
||||
let (outline, creases) = tray(&mut s);
|
||||
// A window: a closed cut line in the base, made a compound path with nothing else.
|
||||
let window = path(&mut s, "M170 170 L210 170 L210 210 L170 210 Z");
|
||||
s.execute("select.set", &json!({ "ids": [window] })).unwrap();
|
||||
let compound = s.execute("object.compoundPath.make", &json!({})).unwrap()["id"].as_u64();
|
||||
let window = compound.unwrap_or(window);
|
||||
role(&mut s, "cut", &[window]);
|
||||
s.execute("select.set", &json!({ "ids": [outline, creases[0], creases[1], creases[2], creases[3], window] })).unwrap();
|
||||
s.execute("object.group", &json!({})).unwrap();
|
||||
let r = check(&mut s, json!({}));
|
||||
assert_eq!(r["scope"], "selection");
|
||||
assert_eq!((r["ok"].as_bool(), r["panels"].as_u64(), r["holes"].as_u64()), (Some(true), Some(5), Some(1)), "{r}");
|
||||
}
|
||||
@@ -186,7 +186,7 @@ fn free_role_name(d: &Document, table: &RoleTable, role: Role) -> String {
|
||||
|
||||
/// Whether `n` can carry a role: a path (a live shape too) that is neither a clipping path nor a
|
||||
/// guide, or a compound path.
|
||||
fn can_carry(n: &Node) -> bool {
|
||||
pub(super) fn can_carry(n: &Node) -> bool {
|
||||
match &n.kind {
|
||||
NodeKind::Path { clipping, guide, .. } => !clipping && !guide,
|
||||
NodeKind::Compound { .. } => true,
|
||||
@@ -199,7 +199,7 @@ fn can_carry(n: &Node) -> bool {
|
||||
/// how many of `roots` and their members can't (text, images, symbol instances and other objects).
|
||||
/// With `editable`, objects that are locked or hidden, are in a locked or hidden group or layer, or
|
||||
/// are on a locked artboard are left out and counted as skipped.
|
||||
fn role_targets(d: &Document, roots: &[NodeId], editable: bool) -> (Vec<NodeId>, usize) {
|
||||
pub(super) fn role_targets(d: &Document, roots: &[NodeId], editable: bool) -> (Vec<NodeId>, usize) {
|
||||
fn walk(n: &Node, out: &mut Vec<NodeId>, skipped: &mut usize) {
|
||||
match &n.kind {
|
||||
NodeKind::Group { children, .. } => {
|
||||
|
||||
@@ -96,7 +96,8 @@ fn common_tangents(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
};
|
||||
return Ok(json!({ "ids": [], "external": 0, "internal": 0, "centerline": null, "warning": warning.to_string() }));
|
||||
}
|
||||
let center = (centerline && (a.center() - b.center()).hypot() > 1e-9).then(|| (a.center(), b.center()));
|
||||
// Centers closer than a billionth of the larger path's size count as one point: no line.
|
||||
let center = (centerline && (a.center() - b.center()).hypot() > 1e-9 * a.size().max(b.size())).then(|| (a.center(), b.center()));
|
||||
let fill = Paint::None;
|
||||
let stroke = if s.paint.stroke.is_none() { Paint::solid(Color::BLACK) } else { s.paint.stroke.clone() };
|
||||
let mut look = s.new_art_look(fill, stroke, s.paint.stroke_width.max(0.1));
|
||||
|
||||
@@ -162,6 +162,19 @@ fn a_convex_bezier_path_and_the_centerline() {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tiny_paths_close_together_still_get_the_centerline() {
|
||||
// Two circles a ten-billionth of a point wide, half a billionth apart: separate, with all four
|
||||
// tangents, and centers apart by far more than their sizes' rounding.
|
||||
let mut s = session();
|
||||
let a = circle(&mut s, 1.0, 1.0, 1e-10);
|
||||
let b = circle(&mut s, 1.0 + 5e-10, 1.0, 1e-10);
|
||||
let r = s.execute(C, &json!({"ids": [a.0, b.0], "centerline": true})).unwrap();
|
||||
assert_eq!((r["external"].as_u64(), r["internal"].as_u64()), (Some(2), Some(2)), "{r}");
|
||||
assert_eq!(r["ids"].as_array().map(Vec::len), Some(5), "{r}");
|
||||
assert_eq!(r["centerline"], r["ids"][4]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_lines_take_the_current_stroke_and_no_fill() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -27,6 +27,9 @@ use crate::EngineError;
|
||||
/// Whether Reset Transformation changes a symbol instance.
|
||||
pub use symbols::reset_transformation_changes;
|
||||
|
||||
/// The Symbols panel's current symbol, as `symbol.list` answers it.
|
||||
pub use symbols::current_symbol;
|
||||
|
||||
mod brushes;
|
||||
mod dynamic;
|
||||
mod symbols;
|
||||
|
||||
@@ -162,7 +162,7 @@ pub(super) fn symbol_sort(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
if d.symbols.is_sorted_by_key(key) {
|
||||
return ok();
|
||||
}
|
||||
let current = current_symbol(d).or_else(|| symbol_names(d).into_iter().next());
|
||||
let current = current_symbol(d);
|
||||
s.edit("Sort by Name", |d, _| {
|
||||
if let Some(name) = current {
|
||||
d.unknown.insert(CURRENT_SYMBOL.into(), json!(name));
|
||||
@@ -173,12 +173,15 @@ pub(super) fn symbol_sort(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
ok()
|
||||
}
|
||||
|
||||
fn symbol_names(d: &Document) -> Vec<String> {
|
||||
d.symbols.iter().map(|s| s.name.clone()).collect()
|
||||
}
|
||||
|
||||
fn current_symbol(d: &Document) -> Option<String> {
|
||||
d.unknown.get(CURRENT_SYMBOL).and_then(Value::as_str).filter(|n| d.symbols.iter().any(|s| s.name == *n)).map(str::to_string)
|
||||
/// The Symbols panel's current symbol, as `symbol.list` answers it: the stored current symbol
|
||||
/// while `d` has a symbol of that name, else the first symbol; `None` when `d` has no symbols.
|
||||
pub fn current_symbol(d: &Document) -> Option<String> {
|
||||
d.unknown
|
||||
.get(CURRENT_SYMBOL)
|
||||
.and_then(Value::as_str)
|
||||
.filter(|n| d.symbols.iter().any(|s| s.name == *n))
|
||||
.or_else(|| d.symbols.first().map(|s| s.name.as_str()))
|
||||
.map(str::to_string)
|
||||
}
|
||||
|
||||
pub(super) fn symbol_list(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
@@ -200,7 +203,7 @@ pub(super) fn symbol_list(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
Ok(json!({ "symbols": list, "current": current_symbol(d).or_else(|| symbol_names(d).into_iter().next()) }))
|
||||
Ok(json!({ "symbols": list, "current": current_symbol(d) }))
|
||||
}
|
||||
|
||||
/// Store `art` ([`normalize`]d, of natural size `size`) as symbol `name`, which becomes the
|
||||
@@ -398,9 +401,7 @@ fn resolve_symbol(d: &Document, p: &Value, cmd: &str) -> Result<String> {
|
||||
match str_param(p, "name") {
|
||||
Some(n) if d.symbols.iter().any(|s| s.name == n) => Ok(n.to_string()),
|
||||
Some(n) => Err(bad(cmd, format!("no symbol named `{n}`"))),
|
||||
None => {
|
||||
current_symbol(d).or_else(|| symbol_names(d).into_iter().next()).ok_or_else(|| EngineError::Other("the document has no symbols".into()))
|
||||
}
|
||||
None => current_symbol(d).ok_or_else(|| EngineError::Other("the document has no symbols".into())),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Live Paint Bucket (Stroke)",
|
||||
[],
|
||||
None,
|
||||
"{group: id, point: [x,y], color?|swatch?|none? (default: current stroke), width?: pt (default: current weight), tolerance?: pt (4), scope?: \"one\" (default: the edge alone) | \"connected\" (a double-click: also each edge joined to it, end to end, through edges that draw with stroke paint match) | \"samePaint\" (a triple-click: also every edge of the group that draws with stroke paint match), match?: paint (as the document stores it; scope connected or samePaint only; default: the stroke paint the edge draws with; an edge draws with the paint of its topmost stroke that is shown, with paint, above 0 pt and not fully transparent, and with none when the edge is fully transparent or has no such stroke), through?: [id…] (scope connected only; at most 4096 of the group's edges, each given once, counted as drawing with stroke paint match whatever they draw with, such as another edge a double-click's clicks painted; any other id is an error), tint?: 0..100, keepModel?: bool (both as paint.setFill)} paint the edge nearest point, skipping hidden edges: each edge reached has its strokes replaced by one stroke with the paint and width, shown, fully opaque and blending normally, in the place of its topmost stroke and with the dashes, caps and arrowheads of its topmost shown stroke (a new stroke above the fills when it has none; none leaves one stroke of none), and its fills stay as they are; when every edge it reaches already has only that one stroke (at any width for none), nothing changes (no undo step, and the recent colors stay as they are) → {group, edge, count (edges reached)}",
|
||||
"{group: id, point: [x,y], color?|swatch?|none? (default: current stroke), width?: pt (default: current weight), tolerance?: pt (4), points?: [[x,y]…] (a drag polyline starting at point; 1 to 4096 finite canvas points; also paints every edge of the group, hidden edges skipped, that the polyline crosses or comes within 0.0001 pt of), continuation?: [[[x,y]…]…] (further path chunks of 1 to 4096 finite canvas points each; each starts at the preceding chunk's last point; requires points), scope?: \"one\" (default: the edge alone) | \"connected\" (a double-click: also each edge joined to it, end to end, through edges that draw with stroke paint match) | \"samePaint\" (a triple-click: also every edge of the group that draws with stroke paint match; \"connected\" and \"samePaint\" are refused with points), match?: paint (as the document stores it; scope connected or samePaint only; default: the stroke paint the edge draws with; an edge draws with the paint of its topmost stroke that is shown, with paint, above 0 pt and not fully transparent, and with none when the edge is fully transparent or has no such stroke), through?: [id…] (scope connected only; at most 4096 of the group's edges, each given once, counted as drawing with stroke paint match whatever they draw with, such as another edge a double-click's clicks painted; any other id is an error), tint?: 0..100, keepModel?: bool (both as paint.setFill)} paint the edge nearest point, skipping hidden edges: each edge reached has its strokes replaced by one stroke with the paint and width, shown, fully opaque and blending normally, in the place of its topmost stroke and with the dashes, caps and arrowheads of its topmost shown stroke (a new stroke above the fills when it has none; none leaves one stroke of none), and its fills stay as they are; when every edge it reaches already has only that one stroke (at any width for none), nothing changes (no undo step, and the recent colors stay as they are) → {group, edge, count (edges reached)}",
|
||||
has_doc,
|
||||
lp_stroke_edge
|
||||
),
|
||||
|
||||
@@ -409,43 +409,61 @@ fn match_param(p: &Value, c: &str, allowed: bool, scopes: &str) -> Result<Option
|
||||
serde_json::from_value::<super::Paint>(v.clone()).map(Some).map_err(|_| bad(c, "match must be a paint as the document stores it"))
|
||||
}
|
||||
|
||||
pub(super) fn lp_fill(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "livePaint.fill";
|
||||
let pt = point_param(p, "point").filter(|q| finite(*q)).ok_or_else(|| bad(C, "missing point [x,y]"))?;
|
||||
let scope = scope_param(p, C)?;
|
||||
let like = match_param(p, C, scope == LpScope::SamePaint, "\"samePaint\"")?;
|
||||
/// The drag path of `livePaint.fill` or `livePaint.strokeEdge` (command `c`) pressed at `start`:
|
||||
/// `points` followed by each chunk of `continuation`, where every chunk holds 1 to
|
||||
/// [`b::LP_FILL_CHUNK_POINTS`] finite canvas points and starts at the last point of the chunk
|
||||
/// before it (`points` at `start`). None when `points` is left out. With a `scope` other than
|
||||
/// `one`, `points` is an error.
|
||||
fn path_param(p: &Value, c: &str, start: Point, scope: LpScope) -> Result<Option<Vec<Vec<Point>>>> {
|
||||
if scope != LpScope::One && p.get("points").is_some() {
|
||||
return Err(bad(C, "scope applies to a click: leave out points"));
|
||||
return Err(bad(c, "scope applies to a click: leave out points"));
|
||||
}
|
||||
let parse_chunk = |input: &Value, start: Point| -> Result<Vec<Point>> {
|
||||
let values = input
|
||||
.as_array()
|
||||
.filter(|points| !points.is_empty() && points.len() <= b::LP_FILL_CHUNK_POINTS)
|
||||
.ok_or_else(|| bad(C, "each path chunk must contain 1 to 4096 points"))?;
|
||||
.ok_or_else(|| bad(c, "each path chunk must contain 1 to 4096 points"))?;
|
||||
let points: Vec<_> = values
|
||||
.iter()
|
||||
.map(|point| {
|
||||
let pair = point.as_array().filter(|pair| pair.len() == 2).ok_or_else(|| bad(C, "points must be [x,y] pairs"))?;
|
||||
let x = pair.first().and_then(Value::as_f64).ok_or_else(|| bad(C, "point x must be a number"))?;
|
||||
let y = pair.get(1).and_then(Value::as_f64).ok_or_else(|| bad(C, "point y must be a number"))?;
|
||||
let pair = point.as_array().filter(|pair| pair.len() == 2).ok_or_else(|| bad(c, "points must be [x,y] pairs"))?;
|
||||
let x = pair.first().and_then(Value::as_f64).ok_or_else(|| bad(c, "point x must be a number"))?;
|
||||
let y = pair.get(1).and_then(Value::as_f64).ok_or_else(|| bad(c, "point y must be a number"))?;
|
||||
let point = Point::new(x, y);
|
||||
if !finite(point) {
|
||||
return Err(bad(C, "points must be finite canvas points"));
|
||||
return Err(bad(c, "points must be finite canvas points"));
|
||||
}
|
||||
Ok(point)
|
||||
})
|
||||
.collect::<Result<_>>()?;
|
||||
if points.first() != Some(&start) {
|
||||
return Err(bad(C, "path chunks must share their boundary point"));
|
||||
return Err(bad(c, "path chunks must share their boundary point"));
|
||||
}
|
||||
Ok(points)
|
||||
};
|
||||
let points = p.get("points");
|
||||
let Some(points) = p.get("points") else {
|
||||
return if p.get("continuation").is_some() { Err(bad(c, "continuation requires points")) } else { Ok(None) };
|
||||
};
|
||||
let continuation = match p.get("continuation") {
|
||||
None => &[][..],
|
||||
Some(input) if points.is_some() => input.as_array().ok_or_else(|| bad(C, "continuation must be an array of path chunks"))?.as_slice(),
|
||||
Some(_) => return Err(bad(C, "continuation requires points")),
|
||||
Some(input) => input.as_array().ok_or_else(|| bad(c, "continuation must be an array of path chunks"))?.as_slice(),
|
||||
};
|
||||
let mut chunks: Vec<Vec<Point>> = Vec::with_capacity(continuation.len() + 1);
|
||||
let mut last = start;
|
||||
for input in std::iter::once(points).chain(continuation) {
|
||||
let chunk = parse_chunk(input, last)?;
|
||||
last = chunk.last().copied().unwrap_or(last);
|
||||
chunks.push(chunk);
|
||||
}
|
||||
Ok(Some(chunks))
|
||||
}
|
||||
|
||||
pub(super) fn lp_fill(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "livePaint.fill";
|
||||
let pt = point_param(p, "point").filter(|q| finite(*q)).ok_or_else(|| bad(C, "missing point [x,y]"))?;
|
||||
let scope = scope_param(p, C)?;
|
||||
let like = match_param(p, C, scope == LpScope::SamePaint, "\"samePaint\"")?;
|
||||
let path = path_param(p, C, pt, scope)?;
|
||||
crate::cmd::paint::check_keep_model(p, C)?;
|
||||
let paint = paint_from(s, p)?.unwrap_or_else(|| s.paint.fill.clone());
|
||||
let group = object_param(p, "group", C)?;
|
||||
@@ -472,7 +490,7 @@ pub(super) fn lp_fill(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
targets.extend(b::faces(n).into_iter().filter(|f| f.visible && f.appearance.fill_paint() == like).map(|f| f.id));
|
||||
}
|
||||
}
|
||||
if let Some(points) = points {
|
||||
if let Some(chunks) = &path {
|
||||
let n = d.node(gid).ok_or(EngineError::NoNode(gid))?;
|
||||
// Use the existing region-crossing probes, so even a face narrower than the distance
|
||||
// between pointer events is filled. Reversing matches visible_face_at's front first.
|
||||
@@ -488,11 +506,8 @@ pub(super) fn lp_fill(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
}
|
||||
let map = b::BuilderMap { regions, ..Default::default() };
|
||||
let mut last = pt;
|
||||
for input in std::iter::once(points).chain(continuation) {
|
||||
let chunk = parse_chunk(input, last)?;
|
||||
last = chunk.last().copied().unwrap_or(last);
|
||||
targets.extend(map.hits_along(&chunk, None).regions.iter().filter_map(|i| face_ids.get(*i).copied()));
|
||||
for chunk in chunks {
|
||||
targets.extend(map.hits_along(chunk, None).regions.iter().filter_map(|i| face_ids.get(*i).copied()));
|
||||
}
|
||||
}
|
||||
Ok((fid, targets))
|
||||
@@ -567,6 +582,7 @@ pub(super) fn lp_stroke_edge(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let tol = number_or(p, "tolerance", 4.0, C)?.clamp(0.0, 1000.0);
|
||||
let scope = scope_param(p, C)?;
|
||||
let like = match_param(p, C, scope != LpScope::One, "\"connected\" or \"samePaint\"")?;
|
||||
let path = path_param(p, C, pt, scope)?;
|
||||
let through: Vec<NodeId> = match p.get("through") {
|
||||
None => vec![],
|
||||
Some(_) if scope != LpScope::Connected => return Err(bad(C, "through applies to scope \"connected\"")),
|
||||
@@ -590,7 +606,18 @@ pub(super) fn lp_stroke_edge(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let eid = start.id;
|
||||
let like = like.unwrap_or_else(|| b::lp_stroke_paint(start));
|
||||
let targets = match scope {
|
||||
LpScope::One => vec![eid],
|
||||
// A drag also reaches every edge of the group that is not hidden and that its path
|
||||
// crosses or touches.
|
||||
LpScope::One => std::iter::once(eid)
|
||||
.chain(
|
||||
path.as_deref()
|
||||
.map(|chunks| b::visible_edges_along(n, chunks))
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.map(|e| e.id)
|
||||
.filter(|id| *id != eid),
|
||||
)
|
||||
.collect(),
|
||||
LpScope::Connected => b::connected_edges_through(n, eid, &like, &through),
|
||||
LpScope::SamePaint => std::iter::once(eid)
|
||||
.chain(b::edges(n).into_iter().filter(|e| e.visible && e.id != eid && b::lp_stroke_paint(e) == like).map(|e| e.id))
|
||||
|
||||
@@ -64,7 +64,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Arc",
|
||||
[],
|
||||
None,
|
||||
"{x1, y1, x2, y2, closed?, slope?} or {x, y, lengthX, lengthY, reference?, baseAlong?: x|y, slope?, closed?, fillArc?} → {id}",
|
||||
"{x1, y1, x2, y2, closed?, slope?: −100…100 (default 100), rotation?: deg clockwise about (x1, y1)} or {x, y, lengthX, lengthY, reference?: 0–8 (default 0), baseAlong?: x|y (either case; default x), slope?: −100…100 (default 50), closed?, fillArc?, rotation?: deg clockwise about the reference point (x, y)} (0: upright); a reference or baseAlong given as anything else (null included) or a slope outside its range is an error and draws nothing → {id}",
|
||||
has_doc,
|
||||
arc
|
||||
),
|
||||
@@ -73,7 +73,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Rectangular Grid",
|
||||
[],
|
||||
None,
|
||||
"{x, y, width, height, rows=5, columns=5, rowSkew=0, columnSkew=0 (−500…500 %: + crowds the horizontal dividers toward the top, the vertical ones toward the right), frame=true (the outside as one rectangle, else its four sides), fill=false (the current fill, else none), rotation?: deg clockwise about the centre (0: upright)} → {id}",
|
||||
"{x, y, width, height, rows=5, columns=5 (whole numbers; at most 999), rowSkew=0, columnSkew=0 (−500…500 %: + crowds the horizontal dividers toward the top, the vertical ones toward the right), frame=true (the outside as one rectangle, else its four sides), fill=false (the current fill, else none), rotation?: deg clockwise about the centre (0: upright)} → {id}",
|
||||
has_doc,
|
||||
rect_grid
|
||||
),
|
||||
@@ -82,7 +82,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Polar Grid",
|
||||
[],
|
||||
None,
|
||||
"{x, y, width, height, concentric=5, radial=5, concentricSkew=0, radialSkew=0 (−500…500 %: + crowds the ellipses toward the outside, the radial dividers clockwise of the top one), compound=false (the ellipses pair up into compound-path rings), fill=false (the current fill, else none), rotation?: deg clockwise about the centre (0: upright)} → {id}",
|
||||
"{x, y, width, height, concentric=5, radial=5 (whole numbers; at most 999), concentricSkew=0, radialSkew=0 (−500…500 %: + crowds the ellipses toward the outside, the radial dividers clockwise of the top one), compound=false (the ellipses pair up into compound-path rings), fill=false (the current fill, else none), rotation?: deg clockwise about the centre (0: upright)} → {id}",
|
||||
has_doc,
|
||||
polar_grid
|
||||
),
|
||||
@@ -299,7 +299,8 @@ fn path_kind(path: PathData, live: Option<LiveShape>) -> NodeKind {
|
||||
/// (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>):
|
||||
/// a box (rectangle, ellipse, grid) runs along the turned axes from `pivot`, the point the dialog
|
||||
/// placed at the click (its top-left corner `x`, `y`, or a grid's reference point), which stays
|
||||
/// put; a polygon or star turns its base orientation about its centre. The params as they are at
|
||||
/// put; an arc sized by its lengths turns about its reference point `x`, `y`, which the dialog
|
||||
/// placed at the click; a polygon or star turns its base orientation about its centre. The params as they are at
|
||||
/// 0° or a whole turn, for other commands and when they already carry a `rotation`.
|
||||
pub fn constrain_click(s: &Session, cmd: &str, mut params: Value, pivot: Point) -> Value {
|
||||
let base = s.prefs.constrain_angle;
|
||||
@@ -318,6 +319,9 @@ pub fn constrain_click(s: &Session, cmd: &str, mut params: Value, pivot: Point)
|
||||
"shape.polygon" | "shape.star" => {
|
||||
o.insert("rotation".into(), json!(rotation));
|
||||
}
|
||||
"shape.arc" if o.contains_key("lengthX") || o.contains_key("lengthY") => {
|
||||
o.insert("rotation".into(), json!(rotation));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
params
|
||||
@@ -590,26 +594,56 @@ fn spiral(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
|
||||
fn arc(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let rotation = if p.get("rotation").is_some() { f64_req(p, "rotation", "shape.arc")? } else { 0.0 };
|
||||
if !rotation.is_finite() {
|
||||
return Err(bad("shape.arc", "rotation must be finite"));
|
||||
}
|
||||
let closed = switch_or(p, "closed", false, "shape.arc")?;
|
||||
let fill_arc = switch_or(p, "fillArc", false, "shape.arc")?;
|
||||
let base_x = !matches!(p.get("baseAlong").and_then(Value::as_str), Some("y" | "Y"));
|
||||
let path = if p.get("lengthX").is_some() || p.get("lengthY").is_some() {
|
||||
// Given values are checked in both forms, null included; only a left-out key takes its default.
|
||||
let base_x = match p.get("baseAlong") {
|
||||
None => true,
|
||||
Some(Value::String(v)) if v.eq_ignore_ascii_case("x") || v.eq_ignore_ascii_case("y") => v.eq_ignore_ascii_case("x"),
|
||||
Some(_) => return Err(bad("shape.arc", "`baseAlong` must be one of x, y")),
|
||||
};
|
||||
let reference = match p.get("reference") {
|
||||
None => 0,
|
||||
Some(v) => match (v.as_u64(), v.as_f64()) {
|
||||
(Some(n), _) if n <= 8 => n as usize,
|
||||
(None, Some(x)) if (0.0..=8.0).contains(&x) && x.fract() == 0.0 => x as usize,
|
||||
_ => return Err(bad("shape.arc", "`reference` must be a whole number from 0 to 8")),
|
||||
},
|
||||
};
|
||||
let slope = |default: f64| {
|
||||
let (key, lo, hi) = ("slope", -100.0, 100.0);
|
||||
let v = number_or(p, key, default, "shape.arc")?;
|
||||
if (lo..=hi).contains(&v) { Ok(v) } else { Err(bad("shape.arc", format!("`{key}` must be from {lo} to {hi}, not {v}"))) }
|
||||
};
|
||||
// The upright path, and the point `rotation` turns it about.
|
||||
let (path, pivot) = if p.get("lengthX").is_some() || p.get("lengthY").is_some() {
|
||||
let anchor = Point::new(f64_req(p, "x", "shape.arc")?, f64_req(p, "y", "shape.arc")?);
|
||||
let reference = p.get("reference").and_then(Value::as_u64).unwrap_or(0) as usize;
|
||||
shapes::arc_segment(
|
||||
let path = shapes::arc_segment(
|
||||
anchor,
|
||||
reference,
|
||||
number_or(p, "lengthX", 100.0, "shape.arc")?,
|
||||
number_or(p, "lengthY", 100.0, "shape.arc")?,
|
||||
base_x,
|
||||
number_or(p, "slope", 50.0, "shape.arc")?,
|
||||
slope(50.0)?,
|
||||
closed,
|
||||
)
|
||||
);
|
||||
(path, anchor)
|
||||
} else {
|
||||
let a = Point::new(f64_req(p, "x1", "shape.arc")?, f64_req(p, "y1", "shape.arc")?);
|
||||
let b = Point::new(f64_req(p, "x2", "shape.arc")?, f64_req(p, "y2", "shape.arc")?);
|
||||
let slope = number_or(p, "slope", 100.0, "shape.arc")?;
|
||||
shapes::arc(a, b, slope, closed, base_x)
|
||||
(shapes::arc(a, b, slope(100.0)?, closed, base_x), a)
|
||||
};
|
||||
// 0 and whole turns leave the path as it is; quarter turns are exact.
|
||||
let bbox_angle = bbox_turn(rotation);
|
||||
let path = if bbox_angle == 0.0 {
|
||||
path
|
||||
} else {
|
||||
let c = pivot.to_vec2();
|
||||
path.transformed(Affine::translate(c) * vectorcraft_geom::rotate_deg(rotation) * Affine::translate(-c))
|
||||
};
|
||||
let fill = if fill_arc { s.paint.fill.clone() } else { vectorcraft_color::Paint::None };
|
||||
let look = s.new_art_look(
|
||||
@@ -617,7 +651,7 @@ fn arc(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
if s.paint.stroke.is_none() { vectorcraft_color::Paint::solid(vectorcraft_color::Color::BLACK) } else { s.paint.stroke.clone() },
|
||||
s.paint.stroke_width.max(0.1),
|
||||
);
|
||||
add_look(s, "Arc", path_kind(path, None), look, None)
|
||||
insert_look_turned(s, "Arc", path_kind(path, None), look, None, true, bbox_angle)
|
||||
}
|
||||
|
||||
/// The grid `paths` (bottom first) as one selected group in the new-art stroke, filled with the
|
||||
@@ -655,13 +689,11 @@ fn grid_group(s: &mut Session, label: &str, (paths, bbox_angle): (Vec<PathData>,
|
||||
Ok(json!({ "id": id.0 }))
|
||||
}
|
||||
|
||||
/// A grid's divider count `count` (an error unless it is a number or null; 5 unless it is a JSON
|
||||
/// whole number of 0 or more, so 4.0 gives 4 and 2.5 gives 5; at most 999) with its skew `key` in percent (0 when
|
||||
/// absent, clamped to ±[`shapes::GRID_SKEW_MAX`]).
|
||||
/// A grid's divider count `count` (5 when absent or null; a whole number of 0 or more, so 4.0 gives
|
||||
/// 4, and anything else, such as 2.5, -1 or `"3"`, is an error; at most 999) with its skew `key` in
|
||||
/// percent (0 when absent, clamped to ±[`shapes::GRID_SKEW_MAX`]).
|
||||
fn dividers(p: &Value, count: &str, key: &str, cmd: &str) -> Result<(u32, f64)> {
|
||||
check_numbers(p, &[count], cmd)?;
|
||||
let whole = |v: &Value| v.as_u64().or_else(|| v.as_f64().filter(|f| f.is_finite() && *f >= 0.0 && f.fract() == 0.0).map(|f| f as u64));
|
||||
let n = p.get(count).and_then(whole).unwrap_or(5).min(999) as u32;
|
||||
let n = count_or(p, count, 5, cmd)?.min(999) as u32;
|
||||
let skew = match p.get(key) {
|
||||
None | Some(Value::Null) => 0.0,
|
||||
Some(v) => v.as_f64().filter(|v| v.is_finite()).ok_or_else(|| bad(cmd, format!("`{key}` must be a number")))?,
|
||||
|
||||
@@ -31,6 +31,6 @@ mod freehand;
|
||||
mod smooth;
|
||||
|
||||
pub use commands::specs;
|
||||
pub(super) use common::{ids_json, replace_with_pieces, usize_opt};
|
||||
pub(super) use common::{center_strokes, ids_json, replace_with_pieces, usize_opt};
|
||||
pub(super) use cut::{components, erase_outline};
|
||||
pub(super) use freehand::freehand_brushed;
|
||||
|
||||
@@ -74,7 +74,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Split Path",
|
||||
[],
|
||||
None,
|
||||
"{id, subpath?, segment, t: 0–1 (0.5)} or {id, subpath?, anchor}: closed paths open there, open paths become two; one of the two new end points is left selected → {ids}. A t outside 0–1 is refused with an error, and nothing changes",
|
||||
"{id, subpath?, segment, t: 0–1 (0.5)} or {id, subpath?, anchor}: closed paths open there, open paths become two; one of the two new end points is left selected; the paths keep the source's fill and stroke settings except that every stroke's alignment becomes Center (in a path of several subpaths, the other subpaths' strokes too) → {ids}. A t outside 0–1 is refused with an error, and nothing changes",
|
||||
has_doc,
|
||||
split
|
||||
),
|
||||
|
||||
@@ -406,6 +406,26 @@ pub(super) fn sibling_with(d: &mut Document, id: NodeId, pd: PathData) -> Result
|
||||
Ok(n)
|
||||
}
|
||||
|
||||
/// Set every stroke of node `id`, and every stroke of the compound path it is a member of (whose
|
||||
/// strokes its members show), to Center alignment. Every other stroke and fill setting stays as it
|
||||
/// is, and an appearance whose strokes are all centered stays shared with its other copies.
|
||||
pub(in super::super) fn center_strokes(d: &mut Document, id: NodeId) {
|
||||
use vectorcraft_doc::{AppearanceItem, StrokeAlign};
|
||||
let parent = d.parent_of(id).filter(|p| matches!(d.node(*p).map(|n| &n.kind), Some(NodeKind::Compound { .. })));
|
||||
for n in [Some(id), parent].into_iter().flatten() {
|
||||
let Some(n) = d.node_mut(n) else { continue };
|
||||
let off = |it: &AppearanceItem| matches!(it, AppearanceItem::Stroke(st) if st.align != StrokeAlign::Center);
|
||||
if !n.appearance.items.iter().any(off) {
|
||||
continue;
|
||||
}
|
||||
for it in &mut n.appearance.items {
|
||||
if let AppearanceItem::Stroke(st) = it {
|
||||
st.align = StrokeAlign::Center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Replace path or compound path `id` with `pieces` (first keeps the id, the rest go right above
|
||||
/// it; none removes it). `cut` removes the path or puts the other pieces above it. Returns ids.
|
||||
pub(in super::super) fn replace_with_pieces(d: &mut Document, cut: &mut Beside, id: NodeId, pieces: Vec<PathData>) -> Result<Vec<NodeId>> {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use super::common::{
|
||||
PenRecord, SIZE_VARIATIONS, SIZES, Sample, dist_to_polyline, fill_targets, ids_json, path_mut, path_of, points_param, poly_bounds,
|
||||
pressure_region, ranged, replace_with_pieces, samples_param, sibling_with, size_pressure, target_paths, usize_opt,
|
||||
PenRecord, SIZE_VARIATIONS, SIZES, Sample, center_strokes, dist_to_polyline, fill_targets, ids_json, path_mut, path_of, points_param,
|
||||
poly_bounds, pressure_region, ranged, replace_with_pieces, samples_param, sibling_with, size_pressure, target_paths, usize_opt,
|
||||
};
|
||||
use super::{
|
||||
Anchor, AnchorKind, Beside, BezPath, BoolOp, Cap, EngineError, FillRule, Join, NodeId, Paint, ParamCurve, PathData, Point, Rect, Result, Session,
|
||||
@@ -225,14 +225,17 @@ pub(super) fn split(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
sel.add(id);
|
||||
sel.anchors.entry(id).or_default().insert((si, 0));
|
||||
};
|
||||
// The paths a cut makes keep the source's appearance with every stroke centered.
|
||||
if sp.closed {
|
||||
path.subpaths[si] = pieces.pop().ok_or_else(|| EngineError::Other("no such anchor".into()))?;
|
||||
center_strokes(d, id);
|
||||
pick(sel, id, si);
|
||||
return Ok(vec![id]);
|
||||
}
|
||||
let [left, right] = <[SubPath; 2]>::try_from(pieces).map_err(|_| EngineError::Other("cannot split an open path at its end point".into()))?;
|
||||
if path.subpaths.len() == 1 {
|
||||
path.subpaths[0] = left;
|
||||
center_strokes(d, id);
|
||||
let node = sibling_with(d, id, PathData::single(right))?;
|
||||
let (parent, idx, _) = d.position(id).ok_or(EngineError::NoNode(id))?;
|
||||
let nid = d.insert(parent, idx + 1, node)?;
|
||||
@@ -241,6 +244,7 @@ pub(super) fn split(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
} else {
|
||||
path.subpaths[si] = left;
|
||||
path.subpaths.insert(si + 1, right);
|
||||
center_strokes(d, id);
|
||||
pick(sel, id, si + 1);
|
||||
Ok(vec![id])
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Export for Screens",
|
||||
["File", "Export"],
|
||||
None,
|
||||
"{folder?, zip?: false (one .zip of every file, each deflated or stored, whichever is smaller: no folder → {name, dataBase64, bytes, files: [name…]}; with a folder it is written there → {path, bytes, files}), artboard?: index | artboards?: [index…] | range?: \"1-3\" (default all), assets?: [asset id…] (instead of artboards: each asset's art alone, cropped to its bounds and named after the asset; see assets.list), layers?: [layer id…] (instead of artboards: each layer's art alone, sublayers included, named after the layer), selection?: one|each (instead of artboards: the selected art as one file, or a file per selected object, named after it), fullDocument?: false (one file per format instead: a PDF of every artboard, other formats the bounds of all visible art, named after the document), includeBleed?: false (artboards grown by the document's bleed), includeArtboardFill?: true (Include Artboard Fill: each artboard's background color behind its art; false leaves it out), pdfs?: multiple|single (Export PDFs As: with several artboards, single writes them as the pages of one PDF per PDF row, named after the document), exportPreset?: (a preset of document.exportPresets.list: its settings, under these params), subfolders?: false (each row's files in a sub-folder: its folder, else its size for raster (1x, 2x, 100w…) or its format (SVG, PDF)), folders?: none|rows (as subfolders)|format (a folder per extension: png, svg, pdf…)|item (a folder per artboard, asset, layer or object)|itemFormat (item/extension) (default: rows with subfolders or a preset, else none), name?: (a file name pattern instead of the item's name, with <filename> for the document, <name> for the artboard, asset, layer or object, <index> from 1, #### for the counter zero-padded to the run of #, <format>, <scale>, <suffix> (else the row's suffix ends the name), YYYYMMDD, YYYY-MM-DD, YYYY, <date>, <time>, <YYYY>, <MM>, <DD>, <hh>, <mm> and <ss>; a trailing .ext is dropped, as in `COMPANY-Logo-<filename>-####-YYYYMMDD`; different files it names alike get -2, -3…), counterStart?: 1, counterPer?: item (every file of an item has its number)|file, date?: YYYY-MM-DD (the date the pattern uses; default today, UTC), preset?: mobile (PNG 1x, 2x, 3x) | density (PNG 0.75x–4x in ldpi…xxxhdpi sub-folders) instead of formats (turns subfolders on), formats?: [{format: png|png8|jpg|webp|gif|tiff|bmp|tga|psd|svg|svgz|pdf|eps|ai|vectorcraft, scale?: 1 | \"2x\" | \"100w\" | \"100h\" | \"72ppi\", width?: px | height?: px | ppi? (raster only; width, then height, then ppi win over scale), suffix?: (raster default: @2x, @100w, @100h, none at 1x; vector formats drop size suffixes), folder?: (its sub-folder), quality?: (jpg 0–100), …the format's options (antiAlias, background, preset (pdf)…)}], settings?: {png|png8|jpg|webp|gif|tiff|bmp|tga|psd|svg|svgz|pdf|eps|ai|vectorcraft: {…options for every row of that format}} (rows' own options win), prefix?, antiAlias?: none|art|type (raster rows without their own), openLocation?: (remembered; the app shows the files after exporting)} one file per artboard and format (a PDF holds its artboard alone; artboards with the same name, in any case, get -2, -3…; an unnamed one is Artboard-N; a row whose file would take a name another row's file has, in any case, gets -2, -3… too, and identical rows write one file; row folders that differ only in case are one folder, spelled as the first row spells it) → {files: [path…]} (into the folder of exportPreset, outside the automation read roots: no ZIP path, and files relative to that folder); no folder → {files: [{name, dataBase64}]} (names include sub-folders: 2x/Icon@2x.png); every reply has warnings: [the encoders' warnings for the files, each once: an image that couldn't be decoded, type written in the fallback font…]. eps, ai and vectorcraft rows write a document of the item alone (its one artboard). The params (but zip and assets) are remembered in the document (document.exportSettings; not an undo step). A key it doesn't take, a key no format takes in a format row or in settings, settings for a format it doesn't write, and an unknown key inside a PDF, EPS or SVG option's object, are refused; a key only another format takes in a row or in settings is not used, and warnings name it as given (formats[0].quality; a key in settings only when no row of that format reads it; not a key of an exportPreset). Under automation read roots, an svg or svgz row, and a row whose files carry the native document (vectorcraft, eps, ai but a version 7 file, a pdf with preserveEditing on that holds every artboard of the document it is written from), is refused, before the folder is made or any file is written, while the document links a JavaScript file outside them, or while the row's file would name a linked image's file outside them, as document.export refuses it",
|
||||
"{folder?, zip?: false (one .zip of every file, each deflated or stored, whichever is smaller: no folder → {name, dataBase64, bytes, files: [name…]}; with a folder it is written there → {path, bytes, files}), artboard?: index | artboards?: [index…] | range?: \"1-3\" (default all), assets?: [asset id…] (instead of artboards: each asset's art alone, cropped to its bounds and named after the asset; see assets.list), layers?: [layer id…] (instead of artboards: each layer's art alone, sublayers included, named after the layer), selection?: one|each (instead of artboards: the selected art as one file, or a file per selected object, named after it), fullDocument?: false (one file per format instead: a PDF of every artboard, other formats the bounds of all visible art, named after the document), includeBleed?: false (artboards grown by the document's bleed), includeArtboardFill?: true (Include Artboard Fill: each artboard's background color behind its art; false leaves it out), pdfs?: multiple|single (Export PDFs As: with several artboards, single writes them as the pages of one PDF per PDF row, named after the document; refused with assets, layers or selection: each), exportPreset?: (a preset of document.exportPresets.list: its settings, under these params), subfolders?: false (each row's files in a sub-folder: its folder, else its size for raster (1x, 2x, 100w…) or its format (SVG, PDF)), folders?: none|rows (as subfolders)|format (a folder per extension: png, svg, pdf…)|item (a folder per artboard, asset, layer or object)|itemFormat (item/extension) (default: rows with subfolders or a preset, else none), name?: (a file name pattern instead of the item's name, with <filename> for the document, <name> for the artboard, asset, layer or object, <index> from 1, #### for the counter zero-padded to the run of #, <format>, <scale>, <suffix> (else the row's suffix ends the name), YYYYMMDD, YYYY-MM-DD, YYYY, <date>, <time>, <YYYY>, <MM>, <DD>, <hh>, <mm> and <ss>; a trailing .ext is dropped, as in `COMPANY-Logo-<filename>-####-YYYYMMDD`; different files it names alike get -2, -3…), counterStart?: 1, counterPer?: item (every file of an item has its number)|file, date?: YYYY-MM-DD (the date the pattern uses; default today, UTC), preset?: mobile (PNG 1x, 2x, 3x) | density (PNG 0.75x–4x in ldpi…xxxhdpi sub-folders) instead of formats (turns subfolders on), formats?: [{format: png|png8|jpg|webp|gif|tiff|bmp|tga|psd|svg|svgz|pdf|eps|ai|vectorcraft, scale?: 1 | \"2x\" | \"100w\" | \"100h\" | \"72ppi\", width?: px | height?: px | ppi? (raster only; width, then height, then ppi win over scale), suffix?: (raster default: @2x, @100w, @100h, none at 1x; vector formats drop size suffixes), folder?: (its sub-folder), quality?: (jpg 0–100), …the format's options (antiAlias, background, preset (pdf)…)}], settings?: {png|png8|jpg|webp|gif|tiff|bmp|tga|psd|svg|svgz|pdf|eps|ai|vectorcraft: {…options for every row of that format}} (rows' own options win), prefix?, antiAlias?: none|art|type (raster rows without their own), openLocation?: (remembered; the app shows the files after exporting)} one file per artboard and format (a PDF holds its artboard alone; artboards with the same name, in any case, get -2, -3…; an unnamed one is Artboard-N; a row whose file would take a name another row's file has, in any case, gets -2, -3… too, and identical rows write one file; row folders that differ only in case are one folder, spelled as the first row spells it) → {files: [path…]} (into the folder of exportPreset, outside the automation read roots: no ZIP path, and files relative to that folder); no folder → {files: [{name, dataBase64}]} (names include sub-folders: 2x/Icon@2x.png); every reply has warnings: [the encoders' warnings for the files, each once: an image that couldn't be decoded, type written in the fallback font…]. eps, ai and vectorcraft rows write a document of the item alone (its one artboard). The params (but zip and assets) are remembered in the document (document.exportSettings; not an undo step). A key it doesn't take, a key no format takes in a format row or in settings, settings for a format it doesn't write, and an unknown key inside a PDF, EPS or SVG option's object, are refused; a key only another format takes in a row or in settings is not used, and warnings name it as given (formats[0].quality; a key in settings only when no row of that format reads it; not a key of an exportPreset). Under automation read roots, an svg or svgz row, and a row whose files carry the native document (vectorcraft, eps, ai but a version 7 file, a pdf with preserveEditing on that holds every artboard of the document it is written from), is refused, before the folder is made or any file is written, while the document links a JavaScript file outside them, or while the row's file would name a linked image's file outside them, as document.export refuses it",
|
||||
has_doc,
|
||||
screens::export_for_screens
|
||||
),
|
||||
|
||||
@@ -350,8 +350,8 @@ struct ScreenParams {
|
||||
/// Where files go: `none` (all in the folder), `rows` (the rows' sub-folders, as
|
||||
/// `subfolders`), `format` (a folder per extension), `item`, or `itemFormat`.
|
||||
folders: Option<String>,
|
||||
/// Export PDFs As: `single` (the artboards a PDF row writes are the pages of one file) or
|
||||
/// `multiple` (a file per artboard, the default).
|
||||
/// Export PDFs As: `single` (the artboards a PDF row writes are the pages of one file; refused
|
||||
/// with assets, layers or `selection: "each"`) or `multiple` (a file per artboard, the default).
|
||||
pdfs: Option<String>,
|
||||
}
|
||||
|
||||
@@ -399,12 +399,18 @@ impl ScreenParams {
|
||||
if p.is_object() { Self::deserialize(p).map_err(|e| bad(C, e.to_string())) } else { Ok(Self::default()) }
|
||||
}
|
||||
|
||||
/// An error when more than one of `assets`, `layers`, `selection` and `fullDocument` is given.
|
||||
/// An error when more than one of `assets`, `layers`, `selection` and `fullDocument` is given,
|
||||
/// and when `pdfs: "single"` is given with `assets`, `layers` or `selection: "each"`, whose
|
||||
/// files each hold the art of one item.
|
||||
fn one_source(&self) -> Result<()> {
|
||||
let sources = [self.full_document, self.assets.is_some(), self.layers.is_some(), self.selection.is_some()].iter().filter(|b| **b).count();
|
||||
if sources > 1 {
|
||||
return Err(bad(C, "give one of assets, layers, selection or fullDocument"));
|
||||
}
|
||||
let per_piece = self.assets.is_some() || self.layers.is_some() || self.selection.as_deref() == Some("each");
|
||||
if per_piece && self.pdfs.as_deref() == Some("single") {
|
||||
return Err(bad(C, "pdfs `single` writes artboards as the pages of one PDF: assets, layers and selection `each` write a PDF each"));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
@@ -1245,6 +1245,41 @@ fn single_file_pdfs_hold_every_chosen_artboard() {
|
||||
assert!(s.execute("document.exportForScreens", &json!({"pdfs": "both", "formats": [{"format": "pdf"}]})).is_err());
|
||||
}
|
||||
|
||||
/// Export PDFs As › Single file holds artboards: with assets, layers or a file per selected object,
|
||||
/// whose files each hold one item's art, it is refused (the Example line too) instead of writing
|
||||
/// the first item alone under the document's name; Multiple files writes a PDF of each item. The
|
||||
/// selection as one file is one PDF either way.
|
||||
#[test]
|
||||
fn single_file_pdfs_are_refused_for_assets_layers_and_each_object() {
|
||||
let mut s = session(1);
|
||||
s.execute("layer.new", &json!({"name": "Second"})).unwrap();
|
||||
s.execute("shape.ellipse", &json!({"x": 30, "y": 5, "width": 8, "height": 8})).unwrap();
|
||||
let doc = s.doc().unwrap().doc.clone();
|
||||
let layers: Vec<u64> = doc.layers.iter().map(|l| l.id.0).collect();
|
||||
let art: Vec<u64> = doc.layers.iter().filter_map(|l| l.children()).flatten().map(|c| c.id.0).collect();
|
||||
assert_eq!((layers.len(), art.len()), (2, 2));
|
||||
let a = s.execute("assets.add", &json!({"ids": [art[0]], "name": "Square"})).unwrap()["assets"][0].as_u64().unwrap();
|
||||
let b = s.execute("assets.add", &json!({"ids": [art[1]], "name": "Dot"})).unwrap()["assets"][0].as_u64().unwrap();
|
||||
s.execute("select.all", &json!({})).unwrap();
|
||||
let pdf = json!([{"format": "pdf"}]);
|
||||
for source in [json!({"assets": [a, b]}), json!({"layers": layers}), json!({"selection": "each"})] {
|
||||
let mut p = source.clone();
|
||||
p["formats"] = pdf.clone();
|
||||
p["pdfs"] = json!("multiple");
|
||||
let r = export(&mut s, p.clone());
|
||||
assert_eq!(names(&r).len(), 2, "a PDF each: {:?} ({source})", names(&r));
|
||||
for (name, bytes) in files(&r) {
|
||||
assert_eq!(vectorcraft_pdf::import(&bytes).unwrap().artboards.len(), 1, "{name}");
|
||||
}
|
||||
p["pdfs"] = json!("single");
|
||||
let e = s.execute("document.exportForScreens", &p).unwrap_err().to_string();
|
||||
assert!(e.contains("pdfs `single`"), "{e} ({source})");
|
||||
assert!(super::screens::first_file(&s, &p).is_err(), "{source}");
|
||||
}
|
||||
let r = export(&mut s, json!({"selection": "one", "pdfs": "single", "formats": pdf}));
|
||||
assert_eq!(names(&r), ["Selection.pdf"]);
|
||||
}
|
||||
|
||||
/// The warnings of reply `r` that name an option the file doesn't read.
|
||||
fn unused(r: &Value) -> Vec<String> {
|
||||
r["warnings"].as_array().unwrap().iter().filter_map(Value::as_str).filter(|w| w.contains("was not used")).map(str::to_string).collect()
|
||||
|
||||
@@ -58,7 +58,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Show Similar Fonts",
|
||||
[],
|
||||
None,
|
||||
"{family (any of its names), limit?: whole number 1..100000 (default: all)} → {family: the family's own name, families: [names]}: the families `text.fontList` lists, ordered as a font menu's Show Similar Fonts orders them: the family itself first, then those that set the same script (Japanese, Thai or neither), then the others, each group nearest first by VectorCraft's own measure of the faces nearest an upright Regular (OS/2 PANOSE digits, weight and width classes, x-height, cap height and average character width, the italic angle, and the kind); an error when the family isn't available or the font menus don't list it, or `limit` is not a whole number from 1 to 100000",
|
||||
"{family (any of its names), limit?: whole number 1..100000 (default: all)} → {family: the family's own name, families: [names]}: the families `text.fontList` lists, ordered as a font menu's Show Similar Fonts orders them: the family itself first, then those that set the same script (Japanese, Thai or neither), then the others, each group nearest first by VectorCraft's own measure of the faces nearest an upright Regular (OS/2 PANOSE digits, weight and width classes, x-height, cap height and average character width, the italic angle, and the kind; a family that shares none of these numbers with it comes after those that share one); an error when the family isn't available or the font menus don't list it, or `limit` is not a whole number from 1 to 100000",
|
||||
always,
|
||||
similar_fonts
|
||||
),
|
||||
|
||||
@@ -244,7 +244,7 @@ impl Gen<'_> {
|
||||
let slot = g.series_paints.get(s);
|
||||
let fill =
|
||||
slot.and_then(|p| p.fill.clone().or_else(|| p.stroke.clone().filter(|st| !st.is_none()))).unwrap_or_else(|| default_series_paint(s));
|
||||
return self.path(band, fill, Paint::solid(Color::BLACK), 0.25);
|
||||
return self.path(band, fill, Paint::solid(Color::BLACK), vectorcraft_doc::FILLED_LINE_OUTLINE_WIDTH);
|
||||
}
|
||||
let (fill, stroke, w) = series_marks(g, s, false, default_series_paint(s), 1.0);
|
||||
self.path(pd, fill, stroke, w)
|
||||
|
||||
@@ -9505,6 +9505,58 @@ fn a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns() {
|
||||
}
|
||||
}
|
||||
|
||||
/// A line graph the graph tools draw with Draw Filled Lines, saved as `.ai` in either form, opens again as the same graph
|
||||
/// with its filled lines and Line Width, the default 3 pt included, and without a warning about graphs. A Line Width past
|
||||
/// the records' 100 pt is saved as the graph's art, with the warning.
|
||||
#[test]
|
||||
fn a_drawn_graph_with_filled_lines_saved_as_ai_opens_with_them() {
|
||||
let dir = vectorcraft_testkit::temp_dir("graph-ai-filled");
|
||||
for (width, live) in [(None, true), (Some(8.0), true), (Some(150.0), false)] {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
|
||||
let csv = ",2024,2025\nQ1,3,2\nQ2,5,4\nQ3,1,6";
|
||||
let id = s.execute("graph.create", &json!({"type": "line", "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap()["id"]
|
||||
.as_u64()
|
||||
.unwrap();
|
||||
let mut options = json!({"id": id, "filledLines": true});
|
||||
if let Some(w) = width {
|
||||
options["lineWidth"] = json!(w);
|
||||
}
|
||||
s.execute("graph.setType", &options).unwrap();
|
||||
let written = spec(&s, NodeId(id));
|
||||
assert_eq!((written.filled_lines, written.line_width), (true, width));
|
||||
for (name, version) in [("v7.ai", Some("7")), ("pdf.ai", None)] {
|
||||
let path = dir.join(format!("{width:?}-{name}"));
|
||||
let mut p = json!({"path": path, "format": "ai"});
|
||||
if let Some(v) = version {
|
||||
p["aiVersion"] = json!(v);
|
||||
}
|
||||
let r = s.execute("file.saveAs", &p).unwrap();
|
||||
let notes = r["warnings"].as_array().cloned().unwrap_or_default();
|
||||
let warned = notes.iter().any(|w| w.as_str().is_some_and(|w| w.starts_with("graphs are written as their art")));
|
||||
assert_eq!(warned, !live, "{width:?} {name}: {r}");
|
||||
let mut again = Session::new();
|
||||
again.execute("document.open", &json!({"path": path})).unwrap();
|
||||
let mut graphs = vec![];
|
||||
again.doc().unwrap().doc.walk(|n| graphs.extend(n.extras().graph.as_deref().map(|g| (n.id, g.clone()))));
|
||||
assert_eq!(graphs.len(), usize::from(live), "{width:?} {name}");
|
||||
if let Some((gid, g)) = graphs.first() {
|
||||
assert_eq!((g.kind, g.cells(), g.filled_lines, g.line_width), (written.kind, written.cells(), true, width), "{width:?} {name}");
|
||||
assert_eq!(g.filled_line_width(), written.filled_line_width(), "{width:?} {name}");
|
||||
// With Draw Filled Lines turned off, each series draws its thin 1 pt line again.
|
||||
again.execute("select.set", &json!({"ids": [gid.0]})).unwrap();
|
||||
again.execute("graph.setType", &json!({"id": gid.0, "filledLines": false})).unwrap();
|
||||
for series in 0..2 {
|
||||
let line = series_parts(&again, *gid, series)
|
||||
.into_iter()
|
||||
.any(|p| p.appearance.fill_paint().is_none() && !p.appearance.stroke_paint().is_none() && p.appearance.stroke_width() == 1.0);
|
||||
assert!(line, "{width:?} {name}: series {series} draws no thin line");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A default legend swatch has the stroke paint and weight of its series' marks, beside the plot or across the top: the
|
||||
/// thin white line of stacked columns and bars, areas and pie wedges, and none on columns and bars. A stroke color kept
|
||||
/// on the series, with or without a weight of its own, is on the swatch too.
|
||||
|
||||
@@ -6,6 +6,7 @@ use vectorcraft_doc::text::INLINE_MAX_SCALE;
|
||||
use vectorcraft_doc::{Document, InlineArt, NodeId, NodeKind, TextRun};
|
||||
use vectorcraft_text::edit;
|
||||
|
||||
use super::brushsym::current_symbol;
|
||||
use super::typecmd::refresh_bounds;
|
||||
use super::{CommandSpec, EngineError, Result, Session, bad, cmd, has_doc, id_param, str_param};
|
||||
|
||||
@@ -97,13 +98,3 @@ fn insert_inline(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
Ok(json!({"id": id.0, "caret": caret}))
|
||||
}
|
||||
|
||||
/// The Symbols panel's current symbol, else the first one.
|
||||
fn current_symbol(d: &Document) -> Option<String> {
|
||||
d.unknown
|
||||
.get("currentSymbol")
|
||||
.and_then(Value::as_str)
|
||||
.filter(|n| d.symbols.iter().any(|s| s.name == *n))
|
||||
.map(str::to_string)
|
||||
.or_else(|| d.symbols.first().map(|s| s.name.clone()))
|
||||
}
|
||||
|
||||
@@ -509,7 +509,16 @@ pub(crate) fn linked_files(d: &Document, base: LinkBase) -> Vec<LinkedFile> {
|
||||
.filter(|g| seen.insert(g.link.path.clone()))
|
||||
.map(|g| {
|
||||
let named = fileio::format_for_name(g.link.name()).or_else(|| fileio::readable_format_for_name(g.link.name()));
|
||||
let own = |b: &&ImageBlob| !b.is_proxy() && named.is_some_and(|f| f.mime == b.mime);
|
||||
// A placed document's PostScript bytes are its file's own only when its name is one that
|
||||
// PostScript is read from (`.eps`, `.epsf`, `.ps`, a PostScript `.ai` or `.ait`).
|
||||
let postscript_name = matches!(fileio::extension(g.link.name()).as_str(), "eps" | "epsf" | "ps" | "ai" | "ait");
|
||||
let postscript = |b: &ImageBlob| {
|
||||
g.document.is_some()
|
||||
&& postscript_name
|
||||
&& b.mime == super::place::document::POSTSCRIPT
|
||||
&& super::place::document::is_postscript(&b.bytes)
|
||||
};
|
||||
let own = |b: &&ImageBlob| !b.is_proxy() && (named.is_some_and(|f| f.mime == b.mime) || postscript(b));
|
||||
let found = locate(&g.link, base);
|
||||
let found_path = found.as_ref().map(|f| f.path.clone());
|
||||
let bytes = found.and_then(|mut f| f.read().ok()).or_else(|| d.images.get(&g.key).filter(own).map(|b| b.bytes.to_vec()));
|
||||
@@ -2361,12 +2370,20 @@ fn format_label(d: &Document, im: &ImageObject) -> &'static str {
|
||||
.map_or("Image", |f| f.label)
|
||||
}
|
||||
|
||||
/// A placed document's `links.list` fields: `format` (`VectorCraft`, or the PDF or `.ai` file's
|
||||
/// format), `document: true` and its artboard's or page's size (`pageWidth`, `pageHeight`, pt)
|
||||
/// instead of pixels.
|
||||
fn document_row(p: &PlacedDocument) -> Value {
|
||||
let pdf = fileio::format_for_name(p.link.name()).filter(|f| matches!(f.id, "pdf" | "ai" | "ait"));
|
||||
json!({ "format": pdf.map_or("VectorCraft", |f| f.label), "document": true, "pageWidth": p.width, "pageHeight": p.height })
|
||||
/// A placed document's `links.list` fields (of `d`): `format` (`VectorCraft`, the PDF or `.ai`
|
||||
/// file's format, or for an EPS or PostScript file `EPS` or `PostScript`), `document: true` and its
|
||||
/// artboard's or page's size (`pageWidth`, `pageHeight`, pt) instead of pixels. A PostScript `.ai`
|
||||
/// is told by its stored bytes or, when a save kept only its preview, by its key.
|
||||
fn document_row(d: &Document, p: &PlacedDocument) -> Value {
|
||||
use super::place::document::{POSTSCRIPT, is_postscript_ai_key};
|
||||
let postscript = d.images.get(&p.key).is_some_and(|b| b.mime == POSTSCRIPT) || is_postscript_ai_key(&p.key);
|
||||
let format = match fileio::format_for_name(p.link.name()) {
|
||||
Some(f) if matches!(f.id, "eps" | "ps") => f.label,
|
||||
_ if postscript => "PostScript",
|
||||
Some(f) if matches!(f.id, "pdf" | "ai" | "ait") => f.label,
|
||||
_ => "VectorCraft",
|
||||
};
|
||||
json!({ "format": format, "document": true, "pageWidth": p.width, "pageHeight": p.height })
|
||||
}
|
||||
|
||||
/// The size in bytes of the file that link `l` (of `st`) names, as Link Info shows it: the file's
|
||||
@@ -2488,7 +2505,7 @@ fn list(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
(im.link.as_ref(), row)
|
||||
}
|
||||
NodeKind::PlacedDocument(p) => (Some(&p.link), document_row(p)),
|
||||
NodeKind::PlacedDocument(p) => (Some(&p.link), document_row(&doc, p)),
|
||||
_ => continue,
|
||||
};
|
||||
let name = link.map_or_else(|| n.display_name(), |l| l.name().to_string());
|
||||
@@ -2929,7 +2946,7 @@ fn placed_info(st: &crate::DocState, doc: &Document, id: NodeId) -> Result<Value
|
||||
let NodeKind::PlacedDocument(pl) = &n.kind else { return Err(bad("links.info", format!("object {} is not a placed document", id.0))) };
|
||||
let size = n.geometric_bounds().unwrap_or_default();
|
||||
let (scale, rotation) = scale_rotation(pl.xf, (1.0, 1.0));
|
||||
let mut out = document_row(pl);
|
||||
let mut out = document_row(doc, pl);
|
||||
let fields = [
|
||||
("id", json!(id.0)),
|
||||
("name", json!(n.display_name())),
|
||||
|
||||
@@ -149,7 +149,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Cut Path at Selected Anchor Points",
|
||||
[],
|
||||
None,
|
||||
"{} cut the paths at their direct-selected anchors (one undo step): a closed path opens there, an open one becomes one path per piece; one of each cut's two coincident anchors stays selected → {ids}",
|
||||
"{} cut the paths at their direct-selected anchors (one undo step): a closed path opens there, an open one becomes one path per piece; one of each cut's two coincident anchors stays selected; the paths keep the source's fill and stroke settings except that every stroke's alignment becomes Center (in a path of several subpaths, the other subpaths' strokes too) → {ids}",
|
||||
has_anchors,
|
||||
cut_at_anchors
|
||||
),
|
||||
@@ -1858,6 +1858,8 @@ fn cut_at_anchors(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
let (mut all, mut picked) = (vec![], vec![]);
|
||||
let mut cut = Beside::replacing(d, &cuts.iter().map(|(id, ..)| *id).collect::<Vec<_>>());
|
||||
for (id, subs, starts) in cuts {
|
||||
// The paths a cut makes keep the source's appearance with every stroke centered.
|
||||
super::draw2::center_strokes(d, id);
|
||||
// A path of one subpath becomes one path per piece (the first keeps the id); the
|
||||
// pieces of a compound shape stay subpaths of it.
|
||||
if d.node(id).and_then(|n| n.path_data()).is_some_and(|pd| pd.subpaths.len() == 1) {
|
||||
|
||||
@@ -9,7 +9,7 @@ use serde_json::{Value, json};
|
||||
use vectorcraft_color::BlendMode;
|
||||
use vectorcraft_doc::appearance::{AppearanceItem, StrokeLayer};
|
||||
use vectorcraft_doc::{AnchorRef, Appearance, Document, Node, NodeId, NodeKind, SegmentRef, TextObject};
|
||||
use vectorcraft_geom::{FillRule, PathData};
|
||||
use vectorcraft_geom::{FillRule, PathData, SubPath};
|
||||
use vectorcraft_pathops as po;
|
||||
use vectorcraft_pathops::{BoolOp, PathfinderOp};
|
||||
|
||||
@@ -352,6 +352,94 @@ pub(crate) fn pf_leaves(d: &Document, n: &Node, out: &mut Vec<Node>) {
|
||||
}
|
||||
}
|
||||
|
||||
/// The region a clip group's members show through: its clipping path's outline
|
||||
/// ([`vectorcraft_render::effects::clip_outline`]), cut by the clip groups around it.
|
||||
struct Clip {
|
||||
path: PathData,
|
||||
rule: FillRule,
|
||||
}
|
||||
|
||||
/// Does `path` have an anchor or handle that isn't a finite number?
|
||||
fn has_invalid_coordinates(path: &PathData) -> bool {
|
||||
path.subpaths.iter().flat_map(|sp| &sp.anchors).any(|a| [a.p, a.h_in, a.h_out].iter().any(|q| !(q.x.is_finite() && q.y.is_finite())))
|
||||
}
|
||||
|
||||
/// A Pathfinder operation's leaf shape ([`pf_leaves`]) with the region its clip groups show it
|
||||
/// through, `None` outside any clip group.
|
||||
type ClippedLeaf = (Node, Option<Arc<Clip>>);
|
||||
|
||||
/// [`pf_leaves`], each with the region the clip groups it is in show it through (#8093). A clip
|
||||
/// group's clipping path is not a leaf, and the members of one whose clipping path clips by nothing
|
||||
/// are hidden, as on the canvas: their region is empty.
|
||||
fn clipped_pf_leaves(d: &Document, n: &Node, clip: Option<&Arc<Clip>>, precision: f64, out: &mut Vec<ClippedLeaf>) -> Result<()> {
|
||||
let (NodeKind::Group { children, clip: clips } | NodeKind::Layer { children, clip: clips, .. }) = &n.kind else {
|
||||
let mut lv = vec![];
|
||||
leaves(n, &mut lv);
|
||||
out.extend(lv.into_iter().map(|l| (l, clip.cloned())));
|
||||
return Ok(());
|
||||
};
|
||||
let hook = |c: &Node| vectorcraft_render::effects::outline_object(Some(d), c);
|
||||
if let Some(art) = vectorcraft_render::effects::compound_shape_art(Some(d), n, Some(&hook)) {
|
||||
out.push((art, clip.cloned()));
|
||||
return Ok(());
|
||||
}
|
||||
if !*clips {
|
||||
return children.iter().try_for_each(|c| clipped_pf_leaves(d, c, clip, precision, out));
|
||||
}
|
||||
let Some((first, rest)) = children.split_first() else { return Ok(()) };
|
||||
let mut region = match vectorcraft_render::effects::clip_outline(first) {
|
||||
Some((outline, rule)) => Clip { path: PathData::from_bezpath(&outline), rule },
|
||||
None => Clip { path: PathData::default(), rule: FillRule::NonZero },
|
||||
};
|
||||
if has_invalid_coordinates(®ion.path) {
|
||||
return Err(EngineError::Other("paths contain invalid coordinates".into()));
|
||||
}
|
||||
if let Some(outer) = clip.filter(|_| !region.path.is_empty()) {
|
||||
let path = po::try_boolean(®ion.path, region.rule, &outer.path, outer.rule, BoolOp::Intersect, precision)
|
||||
.map_err(|e| EngineError::Other(e.to_string()))?;
|
||||
region = Clip { path, rule: FillRule::NonZero };
|
||||
}
|
||||
let region = Arc::new(region);
|
||||
rest.iter().try_for_each(|c| clipped_pf_leaves(d, c, Some(®ion), precision, out))
|
||||
}
|
||||
|
||||
/// `path`, filled by `rule`, where `clip` shows it: its area intersected with the region, filled
|
||||
/// non-zero, and with `lines` (Divide, whose open contours cut) its open contours' parts inside the
|
||||
/// region, so their hidden parts cut nothing.
|
||||
fn clipped(path: PathData, rule: FillRule, clip: &Clip, lines: bool, precision: f64) -> Result<(PathData, FillRule)> {
|
||||
if has_invalid_coordinates(&path) {
|
||||
// Left as it is for the operation to refuse ("paths contain invalid coordinates").
|
||||
return Ok((path, rule));
|
||||
}
|
||||
let (Some(within), Some(bounds)) = (clip.path.control_bounds(), path.control_bounds()) else { return Ok((PathData::default(), rule)) };
|
||||
if within.intersect(bounds).is_zero_area() && !bounds.is_zero_area() {
|
||||
// Wholly outside the region (a line's bounds may be flat, so only an area's are trusted).
|
||||
return Ok((PathData::default(), rule));
|
||||
}
|
||||
let (open, closed): (Vec<SubPath>, Vec<SubPath>) =
|
||||
if lines { path.subpaths.into_iter().partition(|sp| !sp.closed) } else { (vec![], path.subpaths) };
|
||||
let mut subs = vec![];
|
||||
if !closed.is_empty() {
|
||||
let area = po::try_boolean(&PathData::new(closed), rule, &clip.path, clip.rule, BoolOp::Intersect, precision)
|
||||
.map_err(|e| EngineError::Other(e.to_string()))?;
|
||||
subs.extend(area.subpaths);
|
||||
}
|
||||
if !open.is_empty() {
|
||||
let open = PathData::new(open);
|
||||
// Each segment is sampled at least every 1/16 of the region's shorter side (and 24 times),
|
||||
// and the crossings found are refined: a part of the region narrower than that, which a
|
||||
// line crosses between two samples, can be missed.
|
||||
let step = (within.width().min(within.height()) / 16.0).max(precision);
|
||||
let outline = clip.path.to_bezpath();
|
||||
let outside = |q| !vectorcraft_geom::hit::fill_contains(&outline, clip.rule, q);
|
||||
match super::draw2::erase_outline(&open, step, &outside) {
|
||||
Some(pieces) => subs.extend(pieces.into_iter().flat_map(|p| p.subpaths)),
|
||||
None => subs.extend(open.subpaths),
|
||||
}
|
||||
}
|
||||
Ok((PathData::new(subs), FillRule::NonZero))
|
||||
}
|
||||
|
||||
/// How many shapes a Pathfinder operation takes from `n` selected alone: its leaf shapes, however
|
||||
/// deep its groups nest (an expanded stroke is a group inside the group, #1635). Inside a compound
|
||||
/// shape, a blend, an envelope or another live object and a symbol instance count as one shape
|
||||
@@ -591,6 +679,10 @@ fn run_pf(s: &mut Session, p: &Value, op: PathfinderOp) -> Result<Value> {
|
||||
}
|
||||
let shape_mode =
|
||||
matches!(op, PathfinderOp::Unite | PathfinderOp::MinusFront | PathfinderOp::Intersect | PathfinderOp::Exclude | PathfinderOp::MinusBack);
|
||||
// An operand its clipping masks hide altogether is an empty shape for the operations whose
|
||||
// result it changes (Intersect gives nothing, Minus Front loses its back object, Minus Back its
|
||||
// front one, Crop its cropping shape); the others leave it out, which gives the same art.
|
||||
let keeps_hidden = matches!(op, PathfinderOp::Intersect | PathfinderOp::MinusFront | PathfinderOp::MinusBack | PathfinderOp::Crop);
|
||||
let label = pf_label(op);
|
||||
let options = pf_options(s, p, &format!("object.pathfinder.{}", pf_id(op)))?;
|
||||
let ids = s.edit(label, |d, sel| {
|
||||
@@ -598,63 +690,95 @@ fn run_pf(s: &mut Session, p: &Value, op: PathfinderOp) -> Result<Value> {
|
||||
let mut styles: Vec<Style> = vec![];
|
||||
let mut shapes: Vec<po::Shape> = vec![];
|
||||
let mut names: Vec<Option<String>> = vec![];
|
||||
let mut push = |mut path: PathData, rule: FillRule, mut st: Style, name: Option<String>| {
|
||||
if path.is_empty() {
|
||||
return;
|
||||
}
|
||||
// Trim, Merge and Crop remove any strokes (and Merge then merges by fill alone), as the
|
||||
// public Pathfinder documentation describes.
|
||||
if matches!(op, PathfinderOp::Trim | PathfinderOp::Merge | PathfinderOp::Crop) {
|
||||
st.appearance.items.retain(|i| !matches!(i, AppearanceItem::Stroke(_)));
|
||||
}
|
||||
if op == PathfinderOp::Divide && st.appearance.items.iter().any(|i| matches!(i, AppearanceItem::Fill(f) if !f.paint.is_none())) {
|
||||
// Filled open contours keep their implicit closing edge. A zero-area line
|
||||
// stays a cutter; normalised area also catches zero-signed-area self crossings.
|
||||
for sub in path.subpaths.iter_mut().filter(|sp| !sp.closed) {
|
||||
sub.closed = po::encloses_area(sub) || po::area(&PathData::single(sub.clone()), rule) > 0.0;
|
||||
// `hidden`: the masks hide the operand altogether, and its empty path stands for it.
|
||||
let mut push =
|
||||
|mut path: PathData, mut rule: FillRule, mut st: Style, name: Option<String>, clip: Option<&Clip>, hidden: bool| -> Result<()> {
|
||||
if path.is_empty() && !(hidden && keeps_hidden) {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
let key = match styles.iter().position(|x| *x == st) {
|
||||
Some(k) => k,
|
||||
None => {
|
||||
styles.push(st);
|
||||
styles.len() - 1
|
||||
// Trim, Merge and Crop remove any strokes (and Merge then merges by fill alone), as the
|
||||
// public Pathfinder documentation describes.
|
||||
if matches!(op, PathfinderOp::Trim | PathfinderOp::Merge | PathfinderOp::Crop) {
|
||||
st.appearance.items.retain(|i| !matches!(i, AppearanceItem::Stroke(_)));
|
||||
}
|
||||
if op == PathfinderOp::Divide && st.appearance.items.iter().any(|i| matches!(i, AppearanceItem::Fill(f) if !f.paint.is_none())) {
|
||||
// Filled open contours keep their implicit closing edge. A zero-area line
|
||||
// stays a cutter; normalised area also catches zero-signed-area self crossings.
|
||||
for sub in path.subpaths.iter_mut().filter(|sp| !sp.closed) {
|
||||
sub.closed = po::encloses_area(sub) || po::area(&PathData::single(sub.clone()), rule) > 0.0;
|
||||
}
|
||||
}
|
||||
if let Some(clip) = clip {
|
||||
(path, rule) = clipped(path, rule, clip, op == PathfinderOp::Divide, options.precision)?;
|
||||
if path.is_empty() && !keeps_hidden {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
let key = match styles.iter().position(|x| *x == st) {
|
||||
Some(k) => k,
|
||||
None => {
|
||||
styles.push(st);
|
||||
styles.len() - 1
|
||||
}
|
||||
};
|
||||
shapes.push(po::Shape::new(path, rule, key as u64));
|
||||
names.push(name);
|
||||
Ok(())
|
||||
};
|
||||
shapes.push(po::Shape::new(path, rule, key as u64));
|
||||
names.push(name);
|
||||
};
|
||||
// Whether a clip group was among the selection, for the error when its mask hides it all.
|
||||
let mut masked = false;
|
||||
for id in &roots {
|
||||
let n = d.node(*id).ok_or(EngineError::NoNode(*id))?;
|
||||
let mut lv = vec![];
|
||||
pf_leaves(d, n, &mut lv);
|
||||
clipped_pf_leaves(d, n, None, options.precision, &mut lv)?;
|
||||
masked |= lv.iter().any(|(_, clip)| clip.is_some());
|
||||
if lv.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if shape_mode
|
||||
&& roots.len() > 1
|
||||
&& lv.len() > 1
|
||||
&& let Some(top) = lv.last()
|
||||
{
|
||||
// Among other objects, a group acts as one shape (the union of its leaves) with
|
||||
// its top leaf's style. Selected alone, its members are the shapes (#1450).
|
||||
let parts: Vec<(PathData, FillRule)> = lv.iter().filter_map(node_path).collect();
|
||||
let refs: Vec<(&PathData, FillRule)> = parts.iter().map(|(p, r)| (p, *r)).collect();
|
||||
let name = n.name.clone().or_else(|| lv.iter().find_map(|l| l.name.clone()));
|
||||
if shape_mode && roots.len() > 1 && lv.len() > 1 {
|
||||
// Among other objects, a group acts as one shape (the union of its leaves, each
|
||||
// where its clip groups show it) with the style of its top leaf that shows.
|
||||
// Selected alone, its members are the shapes (#1450).
|
||||
let mut parts: Vec<(&Node, PathData, FillRule)> = vec![];
|
||||
for (l, clip) in &lv {
|
||||
let Some((p, r)) = node_path(l) else { continue };
|
||||
let (p, r) = match clip {
|
||||
Some(clip) => clipped(p, r, clip, false, options.precision)?,
|
||||
None => (p, r),
|
||||
};
|
||||
if !p.is_empty() {
|
||||
parts.push((l, p, r));
|
||||
}
|
||||
}
|
||||
let name = n.name.clone().or_else(|| parts.iter().find_map(|(l, ..)| l.name.clone()));
|
||||
let Some((top, ..)) = parts.last() else {
|
||||
// The masks hide the whole group.
|
||||
if let Some((top, _)) = lv.last() {
|
||||
push(PathData::default(), FillRule::NonZero, style_of(top), name, None, true)?;
|
||||
}
|
||||
continue;
|
||||
};
|
||||
let top = *top;
|
||||
let refs: Vec<(&PathData, FillRule)> = parts.iter().map(|(_, p, r)| (p, *r)).collect();
|
||||
push(
|
||||
po::try_unite_all_with(&refs, options.precision).map_err(|e| EngineError::Other(e.to_string()))?,
|
||||
FillRule::NonZero,
|
||||
style_of(top),
|
||||
name,
|
||||
);
|
||||
None,
|
||||
false,
|
||||
)?;
|
||||
} else {
|
||||
for l in &lv {
|
||||
for (l, clip) in &lv {
|
||||
if let Some((p, r)) = node_path(l) {
|
||||
push(p, r, style_of(l), n.name.clone().or_else(|| l.name.clone()));
|
||||
push(p, r, style_of(l), n.name.clone().or_else(|| l.name.clone()), clip.as_deref(), clip.is_some())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if shapes.is_empty() && masked {
|
||||
return Err(EngineError::Other(format!("{label}: the clipping masks hide the selected art")));
|
||||
}
|
||||
if shapes.is_empty() {
|
||||
return Err(EngineError::Other(format!("{label}: select paths, compound paths, groups or text")));
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
|
||||
//! Placed documents (`file.place` of a VectorCraft document, a PDF or a `.ai` file from a file,
|
||||
//! with `link`): one locked object showing an artboard of the document or a page of the PDF, a
|
||||
//! [`PlacedDocument`].
|
||||
//! Placed documents (`file.place` of a VectorCraft document, a PDF, a `.ai` file or an EPS file
|
||||
//! from a file, with `link`): one locked object showing an artboard of the document, a page of the
|
||||
//! PDF or the EPS file's art, a [`PlacedDocument`].
|
||||
//!
|
||||
//! The object keeps the file's bytes (in the document's images, like image data) and the link; the
|
||||
//! art it shows is read from them the way placing the file without Link reads it
|
||||
@@ -33,6 +33,16 @@ pub(crate) const MAX_FILE: usize = 256 << 20;
|
||||
const NATIVE: [&str; 2] = ["vectorcraft", "template"];
|
||||
/// The type a placed VectorCraft document's bytes are stored with (a PDF's: its format's).
|
||||
const MIME: &str = "application/json";
|
||||
/// The type a placed EPS or PostScript file's bytes are stored with.
|
||||
pub(crate) const POSTSCRIPT: &str = "application/postscript";
|
||||
/// What follows the hash in the key of a placed PostScript `.ai` file ([`key_for`]).
|
||||
const AI_MARK: &str = "-ai";
|
||||
|
||||
/// Is `key` (of a placed document) a PostScript `.ai` file's ([`AI_MARK`])? Hashes are hex, so
|
||||
/// only the mark puts `-ai-` in a key.
|
||||
pub(crate) fn is_postscript_ai_key(key: &str) -> bool {
|
||||
key.contains(&format!("{AI_MARK}-"))
|
||||
}
|
||||
|
||||
/// Is `name` with `bytes` a VectorCraft document?
|
||||
pub(crate) fn is_native(name: &str, bytes: &[u8]) -> bool {
|
||||
@@ -44,6 +54,12 @@ pub(crate) fn is_pdf(name: &str, bytes: &[u8]) -> bool {
|
||||
fileio::detect(name, bytes).is_some_and(|f| matches!(f.id, "pdf" | "ai" | "ait")) && !vectorcraft_pdf::is_postscript(bytes)
|
||||
}
|
||||
|
||||
/// Is `bytes` an EPS file, a PostScript file or a PostScript `.ai` or `.ait` file, read by the EPS
|
||||
/// importer (not a DCS file, which is placed as a linked image)?
|
||||
pub(crate) fn is_postscript(bytes: &[u8]) -> bool {
|
||||
vectorcraft_pdf::is_postscript(bytes) && !super::dcs::is_dcs(bytes)
|
||||
}
|
||||
|
||||
/// The editing data of the `.ai` file `name` (`bytes`) when its PDF part is only a placeholder, or
|
||||
/// can't be read:
|
||||
/// the document its pages are read from ([`super::pdf_art`]), with the files it links. `None` for
|
||||
@@ -60,9 +76,12 @@ pub(crate) fn editing_data(name: &str, bytes: &[u8]) -> Option<Document> {
|
||||
}
|
||||
}
|
||||
|
||||
/// The type the bytes of placed file `name` (`bytes`) are stored with: a PDF's format's, else
|
||||
/// [`MIME`].
|
||||
/// The type the bytes of placed file `name` (`bytes`) are stored with: a PDF's format's,
|
||||
/// [`POSTSCRIPT`] for an EPS or PostScript file, else [`MIME`].
|
||||
fn mime(name: &str, bytes: &[u8]) -> &'static str {
|
||||
if is_postscript(bytes) {
|
||||
return POSTSCRIPT;
|
||||
}
|
||||
fileio::detect(name, bytes).filter(|_| is_pdf(name, bytes)).map_or(MIME, |f| f.mime)
|
||||
}
|
||||
|
||||
@@ -108,7 +127,9 @@ pub(crate) struct DocumentArt {
|
||||
/// Artboard `page` (1-based) of the VectorCraft document `name` (`bytes`, read from `path` when
|
||||
/// there is one, so its linked images are found), clipped to the artboard unless `bounding`; or
|
||||
/// page `page` of the PDF or `.ai` file `name`, clipped to its box `page_box` unless `bounding`
|
||||
/// ([`super::pdf_art`]).
|
||||
/// ([`super::pdf_art`]); or the art of the EPS or PostScript file `name` ([`is_postscript`]) on
|
||||
/// its page `page`, clipped to its bounding box unless `bounding`, as placing it without Link reads
|
||||
/// it.
|
||||
pub(crate) fn document_art(
|
||||
name: &str,
|
||||
bytes: &[u8],
|
||||
@@ -135,7 +156,7 @@ fn opened_document_art(
|
||||
) -> Result<DocumentArt> {
|
||||
let file = fileio::file_name(name);
|
||||
let pdf = is_pdf(name, bytes);
|
||||
if !pdf && !is_native(name, bytes) {
|
||||
if !pdf && !is_native(name, bytes) && !is_postscript(bytes) {
|
||||
return Err(bad(cmd, format!("`{file}` isn't a VectorCraft document, a PDF or a PDF-compatible .ai file")));
|
||||
}
|
||||
if bytes.len() > MAX_FILE {
|
||||
@@ -145,6 +166,8 @@ fn opened_document_art(
|
||||
let o = fileio::LoadOptions { crop: crop_to(page_box), ..Default::default() };
|
||||
return super::pdf_art(name, (bytes, opened), path, page as usize, o, bounding, cmd);
|
||||
}
|
||||
// A VectorCraft document, or an EPS or PostScript file: the document our EPS files carry, else
|
||||
// what its PostScript draws.
|
||||
let mut l = fileio::load(name, bytes)?;
|
||||
// Its linked images show their files; its placed documents stay as they are, unless their
|
||||
// stored bytes are lost, when resolving reads their files, which can place this one again.
|
||||
@@ -292,6 +315,10 @@ fn read_source(
|
||||
let hash = shared.map_or_else(|| hash_bytes(bytes), |f| f.hash.to_string());
|
||||
let opened = shared.map(|f| f.opened);
|
||||
let shared = shared.map(|f| f.bytes);
|
||||
// A PostScript `.ai` is read with the artboard its header gives, an EPS file on its page: the
|
||||
// same bytes under the two names show different art, so they have keys of their own.
|
||||
let ai = is_postscript(bytes) && fileio::detect(name, bytes).is_some_and(|f| matches!(f.id, "ai" | "ait"));
|
||||
let hash = if ai { format!("{hash}{AI_MARK}") } else { hash };
|
||||
// The same document placed the same way is read once (placing it again is free).
|
||||
let key = key_for(&hash, page, bounding, page_box);
|
||||
// Resolving its links depends on where the file is and on what the caller may read, so a hit
|
||||
|
||||
@@ -40,6 +40,7 @@ pub(super) const ALLOWED: &[&str] = &[
|
||||
"addon.image.colorMask",
|
||||
"addon.image.removeBackground",
|
||||
"addon.image.removeColorMask",
|
||||
"addon.packaging.check",
|
||||
"addon.packaging.roles",
|
||||
"addon.packaging.setRole",
|
||||
"addon.packaging.setRoleSwatch",
|
||||
|
||||
+222
-31
@@ -5,13 +5,14 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_color::Paint;
|
||||
use vectorcraft_doc::{Document, Node, NodeId, NodeKind};
|
||||
use vectorcraft_doc::{ColorMode, Document, Node, NodeId, NodeKind};
|
||||
|
||||
use super::select::selectable_ids;
|
||||
use super::{CommandSpec, EngineError, Result, Session, always, bad, bool_or, cmd, has_doc, object_param, str_param};
|
||||
use super::{CommandSpec, EngineError, Result, Session, always, bad, cmd, has_doc, object_param, str_param, switch_or};
|
||||
|
||||
/// Magic Wand panel settings. Tolerances: colours as 0–255 RGB distance, stroke weight in
|
||||
/// points, opacity in percent.
|
||||
/// Magic Wand panel settings. Tolerances: colors as a Euclidean distance, 0–255 between RGB
|
||||
/// values in an RGB document and 0–100 between CMYK percentages in a CMYK document; stroke
|
||||
/// weight in points; opacity in percent.
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(default, rename_all = "camelCase")]
|
||||
pub struct WandSettings {
|
||||
@@ -58,33 +59,68 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Magic Wand Options",
|
||||
["Window", "Magic Wand"],
|
||||
None,
|
||||
"{fillColor?, fillTolerance?: 0-255, strokeColor?, strokeTolerance?: 0-255, strokeWeight?, weightTolerance?: pt, opacity?, opacityTolerance?: %, blendingMode?, reset?: bool} → the settings",
|
||||
"{fillColor?, fillTolerance?: 0-255 in an RGB document or 0-100 in a CMYK one, strokeColor?, strokeTolerance?: as fillTolerance, strokeWeight?, weightTolerance?: 0-1000 pt, opacity?, opacityTolerance?: 0-100 %, blendingMode?, reset?: bool} → the settings; a value out of range is an error and changes nothing, and an omitted one keeps its setting",
|
||||
always,
|
||||
set
|
||||
),
|
||||
cmd!(query "magicWand.options", "Magic Wand Settings", [], None, "{} → the Magic Wand settings", always, |s, _| Ok(json!(s.menu.wand))),
|
||||
cmd!(
|
||||
query "magicWand.options",
|
||||
"Magic Wand Settings",
|
||||
[],
|
||||
None,
|
||||
"{} → the Magic Wand settings (color tolerances at most 100 in a CMYK document)",
|
||||
always,
|
||||
|s, _| Ok(json!(s.menu.wand.effective(active_mode(s))))
|
||||
),
|
||||
]
|
||||
}
|
||||
|
||||
fn set(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
if bool_or(p, "reset", false) {
|
||||
s.menu.wand = WandSettings::default();
|
||||
/// The active document's color mode, RGB with no document open.
|
||||
fn active_mode(s: &Session) -> ColorMode {
|
||||
s.doc().map(|st| st.doc.color_mode).unwrap_or_default()
|
||||
}
|
||||
|
||||
/// The largest Fill Color and Stroke Color tolerance in a document of `mode`.
|
||||
pub fn color_tolerance_max(mode: ColorMode) -> f64 {
|
||||
match mode {
|
||||
ColorMode::Rgb => 255.0,
|
||||
ColorMode::Cmyk => 100.0,
|
||||
}
|
||||
let mut v = serde_json::to_value(&s.menu.wand).map_err(|e| EngineError::Other(e.to_string()))?;
|
||||
if let (Some(o), Some(src)) = (v.as_object_mut(), p.as_object()) {
|
||||
for (k, val) in src {
|
||||
if o.contains_key(k) {
|
||||
o.insert(k.clone(), val.clone());
|
||||
}
|
||||
}
|
||||
|
||||
fn set(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const CMD: &str = "magicWand.set";
|
||||
let mode = active_mode(s);
|
||||
let color_max = color_tolerance_max(mode);
|
||||
let mut w = if switch_or(p, "reset", false, CMD)? { WandSettings::default() } else { s.menu.wand.clone() };
|
||||
for (key, flag) in [
|
||||
("fillColor", &mut w.fill_color),
|
||||
("strokeColor", &mut w.stroke_color),
|
||||
("strokeWeight", &mut w.stroke_weight),
|
||||
("opacity", &mut w.opacity),
|
||||
("blendingMode", &mut w.blending_mode),
|
||||
] {
|
||||
// Only a missing key keeps the setting; null, like any other value that isn't true or
|
||||
// false, is an error.
|
||||
if let Some(v) = p.get(key) {
|
||||
*flag = v.as_bool().ok_or_else(|| bad(CMD, format!("`{key}` must be true or false")))?;
|
||||
}
|
||||
}
|
||||
let mut w: WandSettings = serde_json::from_value(v).map_err(|e| bad("magicWand.set", e.to_string()))?;
|
||||
w.fill_tolerance = w.fill_tolerance.clamp(0.0, 255.0);
|
||||
w.stroke_tolerance = w.stroke_tolerance.clamp(0.0, 255.0);
|
||||
w.weight_tolerance = w.weight_tolerance.clamp(0.0, 1000.0);
|
||||
w.opacity_tolerance = w.opacity_tolerance.clamp(0.0, 100.0);
|
||||
for (key, value, max) in [
|
||||
("fillTolerance", &mut w.fill_tolerance, color_max),
|
||||
("strokeTolerance", &mut w.stroke_tolerance, color_max),
|
||||
("weightTolerance", &mut w.weight_tolerance, 1000.0),
|
||||
("opacityTolerance", &mut w.opacity_tolerance, 100.0),
|
||||
] {
|
||||
let Some(v) = p.get(key) else { continue };
|
||||
let n = v.as_f64().ok_or_else(|| bad(CMD, format!("`{key}` must be a number, not {v}")))?;
|
||||
if !(n.is_finite() && (0.0..=max).contains(&n)) {
|
||||
return Err(bad(CMD, format!("`{key}` must be from 0 to {max}, not {n}")));
|
||||
}
|
||||
*value = n;
|
||||
}
|
||||
s.menu.wand = w;
|
||||
Ok(json!(s.menu.wand))
|
||||
Ok(json!(s.menu.wand.effective(mode)))
|
||||
}
|
||||
|
||||
/// The fill an object shows: type's comes from its characters (the first run speaks for all; type
|
||||
@@ -104,25 +140,48 @@ pub(crate) fn stroke_of(n: &Node) -> (Paint, f64) {
|
||||
}
|
||||
}
|
||||
|
||||
/// Are two paints within `tol` (0–255 Euclidean RGB distance)? Non-solid paints must match exactly.
|
||||
pub fn similar_paint(a: &Paint, b: &Paint, tol: f64) -> bool {
|
||||
/// Are two paints within `tol`? In an RGB document `tol` is a 0–255 Euclidean distance between
|
||||
/// the display RGB values; in a CMYK document it is a 0–100 Euclidean distance between the CMYK
|
||||
/// percentages (a CMYK color's own values, any other color converted to CMYK). Non-solid paints
|
||||
/// must match exactly.
|
||||
pub fn similar_paint(a: &Paint, b: &Paint, tol: f64, mode: ColorMode) -> bool {
|
||||
match (a.color(), b.color()) {
|
||||
(Some(x), Some(y)) => {
|
||||
let (x, y) = (x.to_rgb(), y.to_rgb());
|
||||
let d: f64 = (0..3).map(|i| ((x[i] - y[i]) as f64 * 255.0).powi(2)).sum::<f64>().sqrt();
|
||||
d <= tol + 1e-6
|
||||
let (d, margin) = match mode {
|
||||
ColorMode::Rgb => {
|
||||
let (x, y) = (x.to_rgb(), y.to_rgb());
|
||||
((0..3).map(|i| ((x[i] - y[i]) as f64 * 255.0).powi(2)).sum::<f64>().sqrt(), 1e-6)
|
||||
}
|
||||
// CMYK components are f32 fractions, so a distance of exactly `tol` points can come
|
||||
// out a few millionths over.
|
||||
ColorMode::Cmyk => {
|
||||
let (x, y) = (x.to_cmyk(), y.to_cmyk());
|
||||
((0..4).map(|i| ((x[i] - y[i]) as f64 * 100.0).powi(2)).sum::<f64>().sqrt(), 1e-4)
|
||||
}
|
||||
};
|
||||
d <= tol + margin
|
||||
}
|
||||
_ => a == b,
|
||||
}
|
||||
}
|
||||
|
||||
impl WandSettings {
|
||||
/// Does `n` match `reference` on every enabled attribute?
|
||||
pub fn matches(&self, reference: &Node, n: &Node) -> bool {
|
||||
/// The settings in effect in a document of `mode`: the color tolerances are capped at that
|
||||
/// mode's maximum, so a larger value set in an RGB document applies as 100 in a CMYK one and
|
||||
/// comes back in an RGB one.
|
||||
pub fn effective(&self, mode: ColorMode) -> WandSettings {
|
||||
let max = color_tolerance_max(mode);
|
||||
WandSettings { fill_tolerance: self.fill_tolerance.min(max), stroke_tolerance: self.stroke_tolerance.min(max), ..self.clone() }
|
||||
}
|
||||
|
||||
/// Does `n` match `reference` on every enabled attribute, comparing colors as in a document of
|
||||
/// `mode`?
|
||||
pub fn matches(&self, reference: &Node, n: &Node, mode: ColorMode) -> bool {
|
||||
let w = self.effective(mode);
|
||||
let (rs, rw) = stroke_of(reference);
|
||||
let (ns, nw) = stroke_of(n);
|
||||
(!self.fill_color || similar_paint(&fill_of(reference), &fill_of(n), self.fill_tolerance))
|
||||
&& (!self.stroke_color || similar_paint(&rs, &ns, self.stroke_tolerance))
|
||||
(!w.fill_color || similar_paint(&fill_of(reference), &fill_of(n), w.fill_tolerance, mode))
|
||||
&& (!w.stroke_color || similar_paint(&rs, &ns, w.stroke_tolerance, mode))
|
||||
&& (!self.stroke_weight || (rw - nw).abs() <= self.weight_tolerance + 1e-9)
|
||||
&& (!self.opacity || ((reference.opacity - n.opacity).abs() as f64 * 100.0) <= self.opacity_tolerance + 1e-6)
|
||||
&& (!self.blending_mode || reference.blend == n.blend)
|
||||
@@ -156,12 +215,13 @@ fn magic_wand(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let st = s.doc()?;
|
||||
let reference = st.doc.node(id).ok_or(EngineError::NoNode(id))?.clone();
|
||||
let w = s.menu.wand.clone();
|
||||
let mode = st.doc.color_mode;
|
||||
// In isolation mode only the isolated group's contents can be picked, as for Select Same.
|
||||
let inside = st.isolation.map(|iso| selectable_ids(&st.doc, Some(iso)));
|
||||
let hits: Vec<NodeId> = paintable(&st.doc)
|
||||
.into_iter()
|
||||
.filter(|i| inside.as_ref().is_none_or(|set| set.contains(i)))
|
||||
.filter(|i| st.doc.node(*i).is_some_and(|n| w.matches(&reference, n)))
|
||||
.filter(|i| st.doc.node(*i).is_some_and(|n| w.matches(&reference, n, mode)))
|
||||
.collect();
|
||||
let ids: Vec<NodeId> = match str_param(p, "mode").unwrap_or("set") {
|
||||
"add" => st.selection.objects.iter().copied().chain(hits.iter().copied().filter(|h| !st.selection.objects.contains(h))).collect(),
|
||||
@@ -232,6 +292,137 @@ mod tests {
|
||||
assert_eq!(selected(&s), [b]);
|
||||
}
|
||||
|
||||
/// A 10 × 10 rectangle at `x` filled and stroked with the given colors (JSON color values).
|
||||
fn painted(s: &mut Session, x: f64, fill: Value, stroke: Value) -> u64 {
|
||||
let id = s.execute("shape.rectangle", &json!({"x": x, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap();
|
||||
s.execute("paint.setFill", &json!({ "color": fill })).unwrap();
|
||||
s.execute("paint.setStroke", &json!({ "color": stroke })).unwrap();
|
||||
id
|
||||
}
|
||||
|
||||
fn cmyk(c: f64, m: f64, y: f64, k: f64) -> Value {
|
||||
json!({"model": "cmyk", "c": c, "m": m, "y": y, "k": k})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cmyk_document_compares_fill_and_stroke_colors_in_cmyk() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 200, "colorMode": "cmyk"})).unwrap();
|
||||
let white = cmyk(0.0, 0.0, 0.0, 0.0);
|
||||
let a = painted(&mut s, 0.0, cmyk(0.1, 0.0, 0.0, 0.0), white.clone());
|
||||
let b = painted(&mut s, 20.0, cmyk(0.0, 0.0, 0.0, 0.0), white.clone());
|
||||
let c = painted(&mut s, 40.0, cmyk(0.0, 0.1, 0.0, 0.0), white.clone());
|
||||
// a to b is 10 points of cyan; a to c is 10 points of cyan and 10 of magenta (14.1).
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 10})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b]);
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 9.9})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a]);
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 14.2})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b, c]);
|
||||
// Stroke Color alone, the same rule: d's stroke is 5 points of black from a's.
|
||||
let d = painted(&mut s, 60.0, cmyk(1.0, 1.0, 1.0, 1.0), cmyk(0.0, 0.0, 0.0, 0.05));
|
||||
s.execute("magicWand.set", &json!({"fillColor": false, "strokeColor": true, "strokeTolerance": 5})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": d})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b, c, d]);
|
||||
s.execute("magicWand.set", &json!({"strokeTolerance": 4.9})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": d})).unwrap();
|
||||
assert_eq!(selected(&s), [d]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cmyk_document_compares_gray_as_black_ink() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 200, "colorMode": "cmyk"})).unwrap();
|
||||
let none = cmyk(0.0, 0.0, 0.0, 0.0);
|
||||
let a = painted(&mut s, 0.0, json!({"gray": 0.5}), none.clone());
|
||||
let b = painted(&mut s, 20.0, cmyk(0.0, 0.0, 0.0, 0.5), none.clone());
|
||||
let c = painted(&mut s, 40.0, cmyk(0.0, 0.0, 0.0, 0.6), none);
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 0})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b]);
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 10})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b, c]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rgb_document_keeps_the_rgb_distance() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 200})).unwrap();
|
||||
let a = rect(&mut s, 0.0, "#000000", 1.0);
|
||||
let b = rect(&mut s, 20.0, "#0a0000", 1.0);
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 10})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b]);
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 9.9})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a]);
|
||||
assert_eq!(s.execute("magicWand.set", &json!({"fillTolerance": 255})).unwrap()["fillTolerance"], 255.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn set_rejects_tolerances_out_of_range_and_changes_nothing() {
|
||||
let mut s = Session::new();
|
||||
// With no document the color range is the RGB one.
|
||||
assert!(s.execute("magicWand.set", &json!({"fillTolerance": 256})).is_err());
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 200})).unwrap();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 200, "colorMode": "cmyk"})).unwrap();
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 40, "strokeTolerance": 50})).unwrap();
|
||||
let before = s.execute("magicWand.options", &json!({})).unwrap();
|
||||
for bad_value in [
|
||||
json!({"fillTolerance": 101}),
|
||||
json!({"strokeTolerance": 100.5}),
|
||||
json!({"fillTolerance": -1}),
|
||||
json!({"fillTolerance": "40"}),
|
||||
json!({"weightTolerance": 1001}),
|
||||
json!({"opacityTolerance": -0.5}),
|
||||
json!({"fillColor": "yes"}),
|
||||
json!({"fillTolerance": null}),
|
||||
json!({"strokeColor": null}),
|
||||
json!({"reset": "yes", "fillColor": false}),
|
||||
json!({"reset": true, "fillTolerance": 101}),
|
||||
json!({"fillColor": false, "strokeTolerance": 101}),
|
||||
] {
|
||||
let e = s.execute("magicWand.set", &bad_value).unwrap_err().to_string();
|
||||
assert!(e.contains("magicWand.set"), "{bad_value}: {e}");
|
||||
assert_eq!(s.execute("magicWand.options", &json!({})).unwrap(), before, "{bad_value} changed the settings");
|
||||
}
|
||||
assert!(s.execute("magicWand.set", &json!({"fillTolerance": 101})).unwrap_err().to_string().contains("from 0 to 100"));
|
||||
assert_eq!(s.execute("magicWand.set", &json!({"fillTolerance": 100})).unwrap()["fillTolerance"], 100.0);
|
||||
// An omitted value keeps its setting.
|
||||
assert_eq!(s.execute("magicWand.set", &json!({"strokeColor": true})).unwrap()["strokeTolerance"], 50.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_larger_rgb_tolerance_applies_as_100_in_a_cmyk_document_and_comes_back() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 200})).unwrap();
|
||||
s.execute("magicWand.set", &json!({"fillTolerance": 200, "strokeTolerance": 60})).unwrap();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 200, "colorMode": "cmyk"})).unwrap();
|
||||
let o = s.execute("magicWand.options", &json!({})).unwrap();
|
||||
assert_eq!((o["fillTolerance"].as_f64(), o["strokeTolerance"].as_f64()), (Some(100.0), Some(60.0)));
|
||||
// Setting another field does not overwrite the stored fill tolerance.
|
||||
assert_eq!(s.execute("magicWand.set", &json!({"opacity": true})).unwrap()["fillTolerance"], 100.0);
|
||||
// 100 applies: two colors 100 points apart in one channel match, 100 apart in two do not.
|
||||
let none = cmyk(0.0, 0.0, 0.0, 0.0);
|
||||
let a = painted(&mut s, 0.0, cmyk(0.0, 0.0, 0.0, 0.0), none.clone());
|
||||
let b = painted(&mut s, 20.0, cmyk(1.0, 0.0, 0.0, 0.0), none.clone());
|
||||
let c = painted(&mut s, 40.0, cmyk(1.0, 1.0, 0.0, 0.0), none);
|
||||
s.execute("magicWand.set", &json!({"opacity": false})).unwrap();
|
||||
s.execute("select.magicWand", &json!({"id": a})).unwrap();
|
||||
assert_eq!(selected(&s), [a, b]);
|
||||
assert!(!selected(&s).contains(&c));
|
||||
s.execute("document.activate", &json!({"index": 0})).unwrap();
|
||||
assert_eq!(s.execute("magicWand.options", &json!({})).unwrap()["fillTolerance"], 200.0);
|
||||
// Reset gives 32 in either mode.
|
||||
s.execute("document.activate", &json!({"index": 1})).unwrap();
|
||||
let o = s.execute("magicWand.set", &json!({"reset": true})).unwrap();
|
||||
assert_eq!((o["fillTolerance"].as_f64(), o["strokeTolerance"].as_f64()), (Some(32.0), Some(32.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn isolation_mode_limits_the_wand_to_the_isolated_group() {
|
||||
let mut s = Session::new();
|
||||
|
||||
@@ -122,6 +122,7 @@ mod panelcmds;
|
||||
mod paragraphs;
|
||||
mod params;
|
||||
mod path_menu_enabled;
|
||||
mod pathfinder_clip;
|
||||
mod pathops;
|
||||
mod pathtype;
|
||||
mod pattern;
|
||||
|
||||
@@ -2599,3 +2599,50 @@ fn symbol_sort_by_name_orders_the_symbols_in_one_undo_step() {
|
||||
s.execute("symbol.sortByName", &json!({})).unwrap();
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), before);
|
||||
}
|
||||
|
||||
/// `cmd::current_symbol` answers what `symbol.list` answers as `current`, and what `rule` (the
|
||||
/// stored name while a symbol has it, else the first of all the names) answers:
|
||||
/// with no symbols, with no stored name, with a stored name that is not first, after the current
|
||||
/// symbol is deleted, with a stored name no symbol has and with a stored value that is not text.
|
||||
#[test]
|
||||
fn current_symbol_is_the_current_symbol_list_answers() {
|
||||
fn rule(d: &Document) -> Option<String> {
|
||||
let names: Vec<String> = d.symbols.iter().map(|s| s.name.clone()).collect();
|
||||
let stored = d.unknown.get("currentSymbol").and_then(Value::as_str).filter(|n| d.symbols.iter().any(|s| s.name == *n)).map(str::to_string);
|
||||
stored.or_else(|| names.into_iter().next())
|
||||
}
|
||||
fn check(s: &mut Session, want: Option<&str>, case: &str) {
|
||||
let listed = s.execute("symbol.list", &json!({})).unwrap()["current"].clone();
|
||||
let d = &s.doc().unwrap().doc;
|
||||
let helper = crate::cmd::current_symbol(d);
|
||||
assert_eq!(helper.as_deref(), want, "{case}");
|
||||
assert_eq!(json!(helper), listed, "{case}: symbol.list");
|
||||
assert_eq!(helper, rule(d), "{case}: the rule");
|
||||
}
|
||||
fn store(s: &mut Session, v: Value) {
|
||||
std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).unknown.insert("currentSymbol".into(), v);
|
||||
}
|
||||
let mut s = session();
|
||||
check(&mut s, None, "no symbols");
|
||||
store(&mut s, json!("Gone"));
|
||||
check(&mut s, None, "no symbols and a stored name");
|
||||
for (i, name) in ["A", "B", "C"].into_iter().enumerate() {
|
||||
rect(&mut s, 20.0 * i as f64, 0.0, 10.0, 10.0);
|
||||
s.execute("symbol.new", &json!({"name": name})).unwrap();
|
||||
}
|
||||
check(&mut s, Some("C"), "the newest symbol is current");
|
||||
std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).unknown.remove("currentSymbol");
|
||||
check(&mut s, Some("A"), "no stored name");
|
||||
s.execute("symbol.setCurrent", &json!({"name": "B"})).unwrap();
|
||||
check(&mut s, Some("B"), "a stored name that is not first");
|
||||
s.execute("symbol.delete", &json!({"name": "B"})).unwrap();
|
||||
check(&mut s, Some("A"), "the current symbol deleted");
|
||||
store(&mut s, json!("Renamed"));
|
||||
check(&mut s, Some("A"), "a stored name no symbol has");
|
||||
store(&mut s, json!(3));
|
||||
check(&mut s, Some("A"), "a stored number");
|
||||
store(&mut s, json!(["C"]));
|
||||
check(&mut s, Some("A"), "a stored list");
|
||||
store(&mut s, json!("C"));
|
||||
check(&mut s, Some("C"), "a stored name that is last");
|
||||
}
|
||||
|
||||
@@ -5198,6 +5198,137 @@ fn live_paint_bucket_drag_rejects_invalid_points_atomically() {
|
||||
}
|
||||
}
|
||||
|
||||
/// The edge of `g` through (`x`, 25), halfway up the squares of [`live_squares`].
|
||||
fn vertical_edge(s: &Session, g: NodeId, x: f64) -> NodeId {
|
||||
vectorcraft_tools::builder::edge_near(&node(s, g), Point::new(x, 25.0), 0.5).map(|e| e.id).unwrap_or_else(|| panic!("an edge at x {x}"))
|
||||
}
|
||||
|
||||
/// A Shift-drag from an edge strokes every visible edge of that group the drag crosses, between
|
||||
/// pointer events and on the release too, as one undo step that Escape cancels; hidden edges and
|
||||
/// another group's edges keep their strokes.
|
||||
#[test]
|
||||
fn live_paint_bucket_drag_strokes_crossed_edges_as_one_undo() {
|
||||
for cancel in [false, true] {
|
||||
let mut s = session();
|
||||
let g = live_squares(&mut s, &[0.0, 50.0, 100.0, 150.0, 200.0]);
|
||||
let other = live_squares(&mut s, &[300.0]);
|
||||
let black = Paint::solid(Color::rgb(0.0, 0.0, 0.0));
|
||||
let green = Paint::solid(Color::from_hex("#00ff00").unwrap());
|
||||
let all: Vec<NodeId> = [g, other].iter().flat_map(|g| edges_in(&s, *g, Rect::new(-1.0, -1.0, 351.0, 51.0))).collect();
|
||||
paint_parts(&mut s, &all, &black, &[]);
|
||||
let hidden = vertical_edge(&s, g, 100.0);
|
||||
s.edit("t", |d, _| {
|
||||
d.node_mut(hidden).unwrap().visible = false;
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
let before = s.doc().unwrap().doc.clone();
|
||||
let depth = s.doc().unwrap().history.undo.len();
|
||||
let v = ViewInfo::default();
|
||||
s.select_tool("livePaintBucket", v).unwrap();
|
||||
s.paint.stroke = green.clone();
|
||||
s.paint.stroke_width = 3.0;
|
||||
let shift = Mods { shift: true, ..Default::default() };
|
||||
s.pointer(&PointerEvent::new(PointerKind::Down, 50.0, 25.0).with_mods(shift), v).unwrap();
|
||||
// Past the hidden edge and the edge at 150, then back across it, between pointer events.
|
||||
s.pointer(&PointerEvent::new(PointerKind::Drag, 160.0, 25.0).with_mods(shift), v).unwrap();
|
||||
s.pointer(&PointerEvent::new(PointerKind::Drag, 140.0, 30.0).with_mods(shift), v).unwrap();
|
||||
if cancel {
|
||||
assert!(s.tool_busy());
|
||||
s.tool_key(ToolKey::Escape, Mods::default(), v).unwrap();
|
||||
assert!(!s.tool_busy());
|
||||
}
|
||||
// The release crosses the edges at 200 and 250 and goes on into the other group.
|
||||
s.pointer(&PointerEvent::new(PointerKind::Up, 325.0, 25.0).with_mods(shift), v).unwrap();
|
||||
if cancel {
|
||||
assert!(s.doc().unwrap().doc == before, "Escape cancels the whole drag");
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), depth);
|
||||
continue;
|
||||
}
|
||||
let stroke = |s: &Session, id: NodeId| {
|
||||
let n = node(s, id);
|
||||
(n.appearance.stroke_paint(), n.appearance.stroke().map(|st| st.width))
|
||||
};
|
||||
for x in [50.0, 150.0, 200.0, 250.0] {
|
||||
assert_eq!(stroke(&s, vertical_edge(&s, g, x)), (green.clone(), Some(3.0)), "edge at {x}");
|
||||
}
|
||||
for (group, x) in [(g, 0.0), (g, 100.0), (other, 300.0), (other, 350.0)] {
|
||||
assert_eq!(stroke(&s, vertical_edge(&s, group, x)), (black.clone(), Some(1.0)), "edge at {x}");
|
||||
}
|
||||
for e in edges_in(&s, g, Rect::new(-1.0, -1.0, 201.0, 1.0)) {
|
||||
assert_eq!(stroke(&s, e).0, black, "a top edge is not crossed");
|
||||
}
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), depth + 1, "one undo step");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(s.doc().unwrap().doc == before, "one Undo restores every edge");
|
||||
}
|
||||
}
|
||||
|
||||
/// A stroke drag over edges that already have the stroke records no undo step and keeps the redo
|
||||
/// steps.
|
||||
#[test]
|
||||
fn live_paint_bucket_stroke_drag_no_op_keeps_history() {
|
||||
let mut s = session();
|
||||
let g = live_squares(&mut s, &[0.0, 50.0]);
|
||||
let green = Paint::solid(Color::from_hex("#00ff00").unwrap());
|
||||
let all = edges_in(&s, g, Rect::new(-1.0, -1.0, 101.0, 51.0));
|
||||
paint_parts(&mut s, &all, &green, &[]);
|
||||
paint_parts(&mut s, &all, &green, &[]);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
let before = s.doc().unwrap().doc.clone();
|
||||
let (undo, redo) = (s.doc().unwrap().history.undo.len(), s.doc().unwrap().history.redo.len());
|
||||
assert_eq!(redo, 1);
|
||||
let v = ViewInfo::default();
|
||||
s.select_tool("livePaintBucket", v).unwrap();
|
||||
s.paint.stroke = green;
|
||||
s.paint.stroke_width = 1.0;
|
||||
let shift = Mods { shift: true, ..Default::default() };
|
||||
s.pointer(&PointerEvent::new(PointerKind::Down, 0.0, 25.0).with_mods(shift), v).unwrap();
|
||||
s.pointer(&PointerEvent::new(PointerKind::Drag, 60.0, 25.0).with_mods(shift), v).unwrap();
|
||||
s.pointer(&PointerEvent::new(PointerKind::Up, 110.0, 25.0).with_mods(shift), v).unwrap();
|
||||
assert!(s.doc().unwrap().doc == before);
|
||||
assert_eq!((s.doc().unwrap().history.undo.len(), s.doc().unwrap().history.redo.len()), (undo, redo));
|
||||
}
|
||||
|
||||
/// `livePaint.strokeEdge` with `points` paints the crossed edges, counting the edge at the point;
|
||||
/// a malformed path or a scope other than "one" with `points` is an error that changes nothing.
|
||||
#[test]
|
||||
fn live_paint_stroke_drag_rejects_invalid_points_atomically() {
|
||||
let mut s = session();
|
||||
let g = live_squares(&mut s, &[0.0, 50.0, 100.0]);
|
||||
let before = s.doc().unwrap().doc.clone();
|
||||
let stroke = |s: &mut Session, extra: Value| {
|
||||
let mut p = json!({"group": g.0, "point": [50.0, 25.0], "color": "#00ff00"});
|
||||
for (k, v) in extra.as_object().unwrap() {
|
||||
p[k] = v.clone();
|
||||
}
|
||||
s.execute("livePaint.strokeEdge", &p)
|
||||
};
|
||||
for points in
|
||||
[json!([]), json!([[51.0, 25.0]]), json!([[50.0, 25.0], [null, 0]]), json!([[50.0, 25.0], [1e30, 0]]), json!(vec![[50.0, 25.0]; 4097])]
|
||||
{
|
||||
assert!(stroke(&mut s, json!({ "points": points })).is_err(), "{points}");
|
||||
assert_eq!(s.doc().unwrap().doc, before);
|
||||
}
|
||||
for continuation in [json!(null), json!([[[51.0, 25.0], [125.0, 25.0]]]), json!([vec![[50.0, 25.0]; 4097]])] {
|
||||
assert!(stroke(&mut s, json!({ "points": [[50.0, 25.0]], "continuation": continuation })).is_err(), "{continuation}");
|
||||
assert_eq!(s.doc().unwrap().doc, before);
|
||||
}
|
||||
assert!(stroke(&mut s, json!({ "continuation": [[[50.0, 25.0]]] })).is_err());
|
||||
for scope in ["connected", "samePaint"] {
|
||||
assert!(stroke(&mut s, json!({ "points": [[50.0, 25.0], [125.0, 25.0]], "scope": scope })).is_err(), "{scope}");
|
||||
}
|
||||
assert_eq!(s.doc().unwrap().doc, before);
|
||||
// A path in two chunks reaches the edges at 50, 100 and 150, not the one at 0.
|
||||
let r = stroke(&mut s, json!({ "points": [[50.0, 25.0], [90.0, 25.0]], "continuation": [[[90.0, 25.0], [160.0, 25.0]]] })).unwrap();
|
||||
assert_eq!(r["count"], 3);
|
||||
let green = Paint::solid(Color::from_hex("#00ff00").unwrap());
|
||||
for x in [50.0, 100.0, 150.0] {
|
||||
assert_eq!(node(&s, vertical_edge(&s, g, x)).appearance.stroke_paint(), green, "edge at {x}");
|
||||
}
|
||||
assert_ne!(node(&s, vertical_edge(&s, g, 0.0)).appearance.stroke_paint(), green);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn live_paint_bucket_tool_fills_face() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -412,3 +412,97 @@ fn constrain_angle_turns_a_click_made_grid_about_its_reference_point() {
|
||||
let b = bounds(&s, id);
|
||||
assert_eq!((b.x0, b.y0, b.x1, b.y1), (175.0, 150.0, 225.0, 250.0), "turned about the click: {b:?}");
|
||||
}
|
||||
|
||||
/// The anchor points of the path `id`.
|
||||
fn path_points(s: &Session, id: NodeId) -> Vec<Point> {
|
||||
match &s.doc().unwrap().doc.node(id).unwrap().kind {
|
||||
NodeKind::Path { path, .. } => path.subpaths.iter().flat_map(|sp| sp.anchors.iter().map(|a| a.p)).collect(),
|
||||
other => panic!("a path: {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// The direction (degrees, counter-clockwise on the page) of the arc `id`'s first handle.
|
||||
fn first_handle_angle(s: &Session, id: NodeId) -> f64 {
|
||||
let NodeKind::Path { path, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("a path") };
|
||||
let a = &path.subpaths[0].anchors[0];
|
||||
let v = a.h_out - a.p;
|
||||
(-v.y).atan2(v.x).to_degrees()
|
||||
}
|
||||
|
||||
fn near(p: Point, x: f64, y: f64) -> bool {
|
||||
close(p.x, x) && close(p.y, y)
|
||||
}
|
||||
|
||||
/// An arc dragged out runs along the turned axes: at 30° it still runs from the drag's start to
|
||||
/// its end, its base leaves the start along the turned x axis and its bounding box turns 30°; at
|
||||
/// 0° it is as before.
|
||||
#[test]
|
||||
fn constrain_angle_draws_a_dragged_arc_along_the_turned_axes() {
|
||||
let mut s = new_doc();
|
||||
for (deg, handle) in [(0.0, 0.0), (30.0, 30.0)] {
|
||||
set_angle(&mut s, deg);
|
||||
s.select_tool("arc", ViewInfo::default()).unwrap();
|
||||
gesture(&mut s, Mods::default(), &[(Down, 100.0, 100.0), (Drag, 130.0, 110.0), (Drag, 160.0, 120.0), (Up, 160.0, 120.0)]);
|
||||
let id = last_id(&s);
|
||||
let pts = path_points(&s, id);
|
||||
assert!(near(pts[0], 100.0, 100.0) && near(pts[1], 160.0, 120.0), "{deg}°: {pts:?}");
|
||||
assert!(close(first_handle_angle(&s, id), handle), "{deg}°: {}", first_handle_angle(&s, id));
|
||||
if deg == 0.0 {
|
||||
assert_eq!(bbox_angle(&s, id).to_bits(), 0.0f64.to_bits());
|
||||
} else {
|
||||
assert!(close(bbox_angle(&s, id), 30.0), "{}", bbox_angle(&s, id));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// An arc placed by the click dialog keeps its reference point at the click and runs its lengths
|
||||
/// along the turned axes: at 30° from the top-left reference point, and at 90° about the center
|
||||
/// one; at 0° the dialog's params are unchanged.
|
||||
#[test]
|
||||
fn constrain_angle_turns_a_click_made_arc_about_its_reference_point() {
|
||||
let mut s = new_doc();
|
||||
let params = |reference: u64, x: f64, y: f64| json!({"x": x, "y": y, "lengthX": 100, "lengthY": 50, "reference": reference, "baseAlong": "x", "slope": 50, "closed": false, "fillArc": false});
|
||||
let click = Point::new(200.0, 200.0);
|
||||
let p = params(0, 200.0, 200.0);
|
||||
assert_eq!(constrain_click(&s, "shape.arc", p.clone(), click), p, "0°");
|
||||
set_angle(&mut s, 30.0);
|
||||
let turned = constrain_click(&s, "shape.arc", p, click);
|
||||
assert_eq!(turned["rotation"], json!(-30.0));
|
||||
let id = NodeId(s.execute("shape.arc", &turned).unwrap()["id"].as_u64().unwrap());
|
||||
let pts = path_points(&s, id);
|
||||
let r = 30f64.to_radians();
|
||||
let end = (200.0 + 100.0 * r.cos() + 50.0 * r.sin(), 200.0 - 100.0 * r.sin() + 50.0 * r.cos());
|
||||
assert!(near(pts[0], 200.0, 200.0) && near(pts[1], end.0, end.1), "{pts:?} vs {end:?}");
|
||||
assert!(close(bbox_angle(&s, id), 30.0));
|
||||
set_angle(&mut s, 90.0);
|
||||
let p = constrain_click(&s, "shape.arc", params(4, 200.0, 200.0), click);
|
||||
let id = NodeId(s.execute("shape.arc", &p).unwrap()["id"].as_u64().unwrap());
|
||||
// The ends at opposite corners of the 100 × 50 box centered on the click, turned exactly.
|
||||
assert_eq!(path_points(&s, id), vec![Point::new(175.0, 250.0), Point::new(225.0, 150.0)]);
|
||||
let b = bounds(&s, id);
|
||||
assert!(close(b.x0, 175.0) && close(b.y0, 150.0) && close(b.x1, 225.0) && close(b.y1, 250.0), "turned about the click: {b:?}");
|
||||
assert_eq!(bbox_angle(&s, id), 90.0);
|
||||
}
|
||||
|
||||
/// `shape.arc` turns by an explicit `rotation` (clockwise) about `x1`, `y1` or about its reference
|
||||
/// point; a `rotation` that is not a number is refused and adds nothing.
|
||||
#[test]
|
||||
fn arc_rotation_turns_it_and_must_be_a_number() {
|
||||
let mut s = new_doc();
|
||||
let id = NodeId(s.execute("shape.arc", &json!({"x1": 0, "y1": 0, "x2": 10, "y2": 20, "rotation": 90})).unwrap()["id"].as_u64().unwrap());
|
||||
let pts = path_points(&s, id);
|
||||
assert!(near(pts[0], 0.0, 0.0) && near(pts[1], -20.0, 10.0), "{pts:?}");
|
||||
assert_eq!(bbox_angle(&s, id), -90.0, "a quarter turn clockwise");
|
||||
let id =
|
||||
NodeId(s.execute("shape.arc", &json!({"x": 50, "y": 50, "lengthX": 10, "lengthY": 20, "rotation": 360})).unwrap()["id"].as_u64().unwrap());
|
||||
assert_eq!(path_points(&s, id), vec![Point::new(50.0, 50.0), Point::new(60.0, 70.0)], "a whole turn leaves it upright");
|
||||
assert_eq!(bbox_angle(&s, id).to_bits(), 0.0f64.to_bits());
|
||||
for bad in [json!("x"), Value::Null] {
|
||||
for p in
|
||||
[json!({"x1": 0, "y1": 0, "x2": 10, "y2": 20, "rotation": bad}), json!({"x": 0, "y": 0, "lengthX": 10, "lengthY": 20, "rotation": bad})]
|
||||
{
|
||||
assert!(s.execute("shape.arc", &p).is_err(), "{p}");
|
||||
assert_eq!(last_id(&s), id, "nothing added for {p}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2658,6 +2658,66 @@ fn shape_arc_closed_along_y_closes_through_the_top_left_corner() {
|
||||
assert!((area - std::f64::consts::FRAC_PI_4).abs() < 0.01, "{area}");
|
||||
}
|
||||
|
||||
/// A `reference` that is not a whole number from 0 to 8, a `baseAlong` other than x or y, and a
|
||||
/// `slope` outside -100 to 100 are errors naming the key in both forms of `shape.arc`, null
|
||||
/// included, and nothing is drawn and no undo step is added.
|
||||
#[test]
|
||||
fn shape_arc_rejects_an_invalid_reference_base_along_or_slope() {
|
||||
let mut s = session();
|
||||
let objects = |s: &Session| s.doc().unwrap().doc.layers[0].children().unwrap().len();
|
||||
let undo = |s: &Session| s.doc().unwrap().history.undo.len();
|
||||
let (before, steps) = (objects(&s), undo(&s));
|
||||
let sized = json!({"x": 100, "y": 50, "lengthX": 80, "lengthY": 40});
|
||||
let ends = json!({"x1": 0, "y1": 0, "x2": 50, "y2": 50});
|
||||
let mut cases = vec![];
|
||||
for v in [json!("4"), json!(-1), json!(4.5), json!(9), json!(9.0), json!(true), json!(null), json!([0])] {
|
||||
cases.push(("reference", "`reference` must be a whole number from 0 to 8".to_string(), v));
|
||||
}
|
||||
for v in [json!("z"), json!("yes"), json!(""), json!(1), json!(false), json!(null), json!({"axis": "y"})] {
|
||||
cases.push(("baseAlong", "`baseAlong` must be one of x, y".to_string(), v));
|
||||
}
|
||||
for (v, shown) in [(json!(150), "150"), (json!(-100.5), "-100.5")] {
|
||||
cases.push(("slope", format!("`slope` must be from -100 to 100, not {shown}"), v));
|
||||
}
|
||||
for form in [&sized, &ends] {
|
||||
for (key, want, v) in &cases {
|
||||
let mut p = form.clone();
|
||||
p[*key] = v.clone();
|
||||
let r = s.execute("shape.arc", &p);
|
||||
assert!(matches!(&r, Err(EngineError::BadParams { msg, .. }) if msg == want), "{p}: {r:?}");
|
||||
assert_eq!((objects(&s), undo(&s)), (before, steps), "{p}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `shape.arc` takes each of the nine reference points (`4.0` as 4) and x or y in either case for
|
||||
/// `baseAlong`; a left-out `reference` is 0 and a left-out `baseAlong` is x.
|
||||
#[test]
|
||||
fn shape_arc_takes_every_reference_point_and_either_base_axis() {
|
||||
let mut s = session();
|
||||
let arc = |s: &mut Session, extra: serde_json::Value| {
|
||||
let mut p = json!({"x": 100, "y": 50, "lengthX": 80, "lengthY": 40});
|
||||
for (k, v) in extra.as_object().unwrap() {
|
||||
p[k] = v.clone();
|
||||
}
|
||||
let id = NodeId(s.execute("shape.arc", &p).unwrap()["id"].as_u64().unwrap());
|
||||
s.doc().unwrap().doc.node(id).unwrap().path_data().unwrap().clone()
|
||||
};
|
||||
let start = |path: &PathData| path.subpaths[0].anchors[0].p;
|
||||
for r in 0..=8u64 {
|
||||
let p = start(&arc(&mut s, json!({ "reference": r })));
|
||||
let (col, row) = ((r % 3) as f64, (r / 3) as f64);
|
||||
assert_eq!(p, Point::new(100.0 - 40.0 * col, 50.0 - 20.0 * row), "reference {r}");
|
||||
}
|
||||
assert_eq!(arc(&mut s, json!({"reference": 4.0})), arc(&mut s, json!({"reference": 4})));
|
||||
assert_eq!(arc(&mut s, json!({})), arc(&mut s, json!({"reference": 0, "baseAlong": "x"})));
|
||||
assert_eq!(arc(&mut s, json!({"baseAlong": "X"})), arc(&mut s, json!({"baseAlong": "x"})));
|
||||
assert_eq!(arc(&mut s, json!({"baseAlong": "Y"})), arc(&mut s, json!({"baseAlong": "y"})));
|
||||
assert_ne!(arc(&mut s, json!({"baseAlong": "y"})), arc(&mut s, json!({"baseAlong": "x"})));
|
||||
let ends = json!({"x1": 0, "y1": 0, "x2": 50, "y2": 50, "slope": -100});
|
||||
assert!(s.execute("shape.arc", &ends).is_ok());
|
||||
}
|
||||
|
||||
/// A spiral dragged out with Alt pressed part way gets four more segments per wind as its outer end
|
||||
/// moves out. Ctrl/Cmd pressed part way fits the decay so the inner end keeps its distance from the
|
||||
/// center. The Spiral tool keeps both values for the next spiral.
|
||||
@@ -2822,7 +2882,7 @@ fn polar_grid_options_compound_fill_and_skew() {
|
||||
assert!(tips(&inward)[1..].iter().all(|t| t.x < 50.0), "counterclockwise of the top: {:?}", tips(&inward));
|
||||
}
|
||||
|
||||
/// A divider count written as a whole float (`3.0`) is the same as `3`; a fraction gives the default 5.
|
||||
/// A divider count written as a whole float (`3.0`) is the same as `3`.
|
||||
#[test]
|
||||
fn grid_divider_counts_accept_whole_floats() {
|
||||
let mut s = session();
|
||||
@@ -2834,8 +2894,30 @@ fn grid_divider_counts_accept_whole_floats() {
|
||||
let float = grid(&mut s, "shape.polarGrid", with(&size, json!({"concentric": 2.0, "radial": 3.0})));
|
||||
let int = grid(&mut s, "shape.polarGrid", with(&size, json!({"concentric": 2, "radial": 3})));
|
||||
assert_eq!(float.len(), int.len());
|
||||
let frac = grid(&mut s, "shape.rectangularGrid", with(&size, json!({"rows": 2.5, "columns": 2.5})));
|
||||
assert_eq!(frac.len(), 11);
|
||||
}
|
||||
|
||||
/// A divider count that is not a whole number of 0 or more (a fraction, a negative) is an error
|
||||
/// naming the key, and no grid is made; a left-out or null count is 5.
|
||||
#[test]
|
||||
fn grid_divider_counts_reject_fractions_and_negatives() {
|
||||
let mut s = session();
|
||||
let size = json!({"x": 0, "y": 0, "width": 100, "height": 100});
|
||||
let undo = |s: &Session| s.doc().unwrap().history.undo.len();
|
||||
let before = undo(&s);
|
||||
for (cmd, key, value, shown) in [
|
||||
("shape.rectangularGrid", "rows", json!(2.5), "2.5"),
|
||||
("shape.rectangularGrid", "columns", json!(-1), "-1"),
|
||||
("shape.polarGrid", "concentric", json!(0.5), "0.5"),
|
||||
("shape.polarGrid", "radial", json!(-3.0), "-3"),
|
||||
] {
|
||||
let r = s.execute(cmd, &with(&size, json!({ key: value })));
|
||||
let want = format!("`{key}` must be a whole number of at least 0, not {shown}");
|
||||
assert!(matches!(&r, Err(EngineError::BadParams { msg, .. }) if *msg == want), "{cmd} {key}={value}: {r:?}");
|
||||
assert_eq!(undo(&s), before, "{cmd} {key}={value}");
|
||||
}
|
||||
let omitted = grid(&mut s, "shape.rectangularGrid", size.clone());
|
||||
let null = grid(&mut s, "shape.rectangularGrid", with(&size, json!({"rows": null, "columns": null})));
|
||||
assert_eq!((omitted.len(), null.len()), (11, 11));
|
||||
}
|
||||
|
||||
/// The grid options are checked: a divider count or a skew is a number and a switch true or false,
|
||||
@@ -3219,6 +3301,88 @@ fn split_refuses_a_subpath_anchor_or_segment_that_is_not_a_whole_number() {
|
||||
}
|
||||
}
|
||||
|
||||
/// Give `id` a 4 pt round-capped Inside stroke and, above it, a hidden red copy aligned Outside.
|
||||
/// Returns the appearance it now has.
|
||||
fn side_strokes(s: &mut Session, id: NodeId) -> vectorcraft_doc::Appearance {
|
||||
use vectorcraft_doc::{AppearanceItem, LineCap, StrokeAlign};
|
||||
s.edit("Side Strokes", |d, _| {
|
||||
let ap = &mut d.node_mut(id).unwrap().appearance;
|
||||
let st = ap.stroke_mut().unwrap();
|
||||
(st.width, st.cap, st.align) = (4.0, LineCap::Round, StrokeAlign::Inside);
|
||||
let mut top = st.clone();
|
||||
(top.align, top.visible, top.paint) =
|
||||
(StrokeAlign::Outside, false, vectorcraft_color::Paint::solid(vectorcraft_color::Color::rgb(1.0, 0.0, 0.0)));
|
||||
ap.items.push(AppearanceItem::Stroke(top));
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
appearance(s, id)
|
||||
}
|
||||
|
||||
fn appearance(s: &Session, id: NodeId) -> vectorcraft_doc::Appearance {
|
||||
(*s.doc().unwrap().doc.node(id).unwrap().appearance).clone()
|
||||
}
|
||||
|
||||
/// `ap` with every stroke aligned Center and nothing else changed.
|
||||
fn centered(ap: &vectorcraft_doc::Appearance) -> vectorcraft_doc::Appearance {
|
||||
let mut ap = ap.clone();
|
||||
for it in &mut ap.items {
|
||||
if let vectorcraft_doc::AppearanceItem::Stroke(st) = it {
|
||||
st.align = vectorcraft_doc::StrokeAlign::Center;
|
||||
}
|
||||
}
|
||||
ap
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scissors_cut_paths_have_their_strokes_centered() {
|
||||
// The paths a Scissors cut makes keep the source's fill and strokes, every stroke centered,
|
||||
// in the cut's one undo step; redo centers them again.
|
||||
let mut s = session();
|
||||
let r = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
|
||||
let before = side_strokes(&mut s, r);
|
||||
assert_ne!(before, centered(&before));
|
||||
let undo = undo_steps(&s);
|
||||
s.execute("path.split", &json!({"id": r.0, "anchor": 2})).unwrap();
|
||||
assert_eq!(undo_steps(&s), undo + 1);
|
||||
assert!(!path(&s, r).subpaths[0].closed);
|
||||
assert_eq!(appearance(&s, r), centered(&before), "closed path");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(path(&s, r).subpaths[0].closed);
|
||||
assert_eq!(appearance(&s, r), before, "undo");
|
||||
s.execute("edit.redo", &json!({})).unwrap();
|
||||
assert_eq!(appearance(&s, r), centered(&before), "redo");
|
||||
// An open path becomes two, at an anchor or inside a segment, both centered.
|
||||
let anchors = json!([{"x": 100, "y": 300}, {"x": 200, "y": 300}, {"x": 300, "y": 300}]);
|
||||
for at in [json!({"anchor": 1}), json!({"segment": 0, "t": 0.5})] {
|
||||
let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
|
||||
let before = side_strokes(&mut s, id);
|
||||
let made = s.execute("path.split", &with(&at, json!({"id": id.0}))).unwrap();
|
||||
let ids: Vec<NodeId> = made["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
|
||||
assert_eq!(ids.len(), 2, "{at}");
|
||||
for i in ids {
|
||||
assert_eq!(appearance(&s, i), centered(&before), "{at}: {i:?}");
|
||||
}
|
||||
}
|
||||
// A path of several subpaths keeps one node: its other subpath's strokes are centered too.
|
||||
let id = two_subpaths(&mut s);
|
||||
let before = side_strokes(&mut s, id);
|
||||
s.execute("path.split", &json!({"id": id.0, "anchor": 1})).unwrap();
|
||||
assert_eq!(path(&s, id).subpaths.len(), 3);
|
||||
assert_eq!(appearance(&s, id), centered(&before), "several subpaths");
|
||||
// A cut that fails, at an open path's end point, changes neither the strokes nor the history.
|
||||
let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
|
||||
let before = side_strokes(&mut s, id);
|
||||
let undo = undo_steps(&s);
|
||||
assert!(s.execute("path.split", &json!({"id": id.0, "anchor": 0})).is_err());
|
||||
assert_eq!((undo_steps(&s), appearance(&s, id)), (undo, before));
|
||||
// Strokes already centered stay shared with the undo history's copy.
|
||||
let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
|
||||
let shared = s.doc().unwrap().doc.node(id).unwrap().appearance.clone();
|
||||
s.execute("path.split", &json!({"id": id.0, "anchor": 1})).unwrap();
|
||||
assert!(vectorcraft_doc::Shared::ptr_eq(&s.doc().unwrap().doc.node(id).unwrap().appearance, &shared));
|
||||
}
|
||||
|
||||
/// A subpath, anchor or segment of 2^32 + k fails, where k names one that exists, and the document
|
||||
/// and the undo history stay as they were. A 32-bit build read the number as k.
|
||||
#[test]
|
||||
@@ -3938,6 +4102,54 @@ fn cut_at_anchors_splits_paths_and_leaves_one_end_selected() {
|
||||
assert_eq!(undo_steps(&s), undo);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cut_at_anchors_paths_have_their_strokes_centered() {
|
||||
// Every path the cut makes keeps the source's fill and strokes, every stroke centered, in one
|
||||
// undo step; a path whose anchors were not selected keeps its strokes.
|
||||
let mut s = session();
|
||||
let anchors = json!([{"x": 100, "y": 100}, {"x": 200, "y": 100}, {"x": 300, "y": 100}, {"x": 400, "y": 100}]);
|
||||
let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
|
||||
let open = side_strokes(&mut s, id);
|
||||
let r = rect(&mut s, 500.0, 100.0, 100.0, 100.0);
|
||||
let closed = side_strokes(&mut s, r);
|
||||
let other = rect(&mut s, 100.0, 300.0, 100.0, 100.0);
|
||||
let untouched = side_strokes(&mut s, other);
|
||||
s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1], [0, 2]]})).unwrap();
|
||||
s.execute("select.anchors", &json!({"id": r.0, "anchors": [[0, 2]], "mode": "add"})).unwrap();
|
||||
assert_eq!(s.doc().unwrap().selection.anchors.len(), 2);
|
||||
let undo = undo_steps(&s);
|
||||
let made = s.execute("path.cutAtAnchors", &json!({})).unwrap();
|
||||
let ids: Vec<NodeId> = made["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
|
||||
assert_eq!(undo_steps(&s), undo + 1);
|
||||
assert_eq!(ids.len(), 4, "three pieces and the opened rectangle");
|
||||
for i in &ids {
|
||||
let want = if *i == r { centered(&closed) } else { centered(&open) };
|
||||
assert_eq!(appearance(&s, *i), want, "{i:?}");
|
||||
}
|
||||
assert_eq!(appearance(&s, other), untouched);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!((appearance(&s, id), appearance(&s, r)), (open.clone(), closed.clone()), "undo");
|
||||
s.execute("edit.redo", &json!({})).unwrap();
|
||||
assert_eq!((appearance(&s, id), appearance(&s, r)), (centered(&open), centered(&closed)), "redo");
|
||||
// A cut member of a compound path: the compound path's strokes, which it shows, are centered.
|
||||
let a = rect(&mut s, 100.0, 450.0, 100.0, 100.0);
|
||||
let b = rect(&mut s, 125.0, 475.0, 50.0, 50.0);
|
||||
s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
|
||||
s.execute("object.compoundPath.make", &json!({})).unwrap();
|
||||
let compound = s.doc().unwrap().selection.objects[0];
|
||||
let before = side_strokes(&mut s, compound);
|
||||
let members: Vec<NodeId> = match &s.doc().unwrap().doc.node(compound).unwrap().kind {
|
||||
NodeKind::Compound { children, .. } => children.iter().map(|c| c.id).collect(),
|
||||
k => panic!("not a compound path: {k:?}"),
|
||||
};
|
||||
let held = path(&s, members[1]);
|
||||
s.execute("select.anchors", &json!({"id": members[0].0, "anchors": [[0, 2]]})).unwrap();
|
||||
s.execute("path.cutAtAnchors", &json!({})).unwrap();
|
||||
assert!(!path(&s, members[0]).subpaths[0].closed);
|
||||
assert_eq!(path(&s, members[1]), held, "the other member keeps its shape");
|
||||
assert_eq!(appearance(&s, compound), centered(&before), "compound path");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn direct_segment_delete_keeps_the_other_rectangle_edges_and_one_undo() {
|
||||
for initially_selected in [false, true] {
|
||||
|
||||
@@ -746,6 +746,87 @@ fn package_copies_a_linked_pdf_page_as_it_is() {
|
||||
assert!(s.doc().unwrap().doc.has_placed());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn package_copies_a_linked_eps_file_as_it_is() {
|
||||
let dir = Folder::new("package-placed-eps");
|
||||
let eps = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 50\n%%EndComments\n1 0 0 setrgbcolor\nnewpath 0 0 moveto 100 0 lineto 100 50 lineto 0 50 lineto closepath fill\nshowpage\n%%EOF\n";
|
||||
let src = dir.file("art/seal.eps");
|
||||
write(&src, eps);
|
||||
let mut s = session();
|
||||
let placed = run(&mut s, "file.place", json!({"path": src}));
|
||||
assert_eq!(placed["linked"], true, "{placed}");
|
||||
save(&mut s, &dir.file("poster.vectorcraft"));
|
||||
let r = run(&mut s, "file.package", json!({"folder": dir.file("out")}));
|
||||
assert_eq!((r["links"].as_u64(), r["missingLinks"].clone(), r["warnings"].clone()), (Some(1), json!([]), json!([])), "{r}");
|
||||
let root = dir.0.join("out/poster Folder");
|
||||
assert_eq!(std::fs::read(root.join("Links/seal.eps")).unwrap(), eps, "copied as it is");
|
||||
// The packaged document shows the copy.
|
||||
std::fs::remove_dir_all(dir.0.join("art")).unwrap();
|
||||
let opened = open(&mut s, &root.join("poster.vectorcraft").to_string_lossy());
|
||||
assert_eq!(opened["missingLinks"], json!([]), "{opened}");
|
||||
assert!(s.doc().unwrap().doc.has_placed());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn package_copies_a_linked_postscript_ai_file_the_document_holds_after_it_is_gone() {
|
||||
let dir = Folder::new("package-placed-ps-ai");
|
||||
let ai = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 50\n%%EndComments\n0 0 1 setrgbcolor\nnewpath 0 0 moveto 100 0 lineto 100 50 lineto 0 50 lineto closepath fill\nshowpage\n%%EOF\n";
|
||||
let src = dir.file("art/badge.ai");
|
||||
write(&src, ai);
|
||||
let mut s = session();
|
||||
let placed = run(&mut s, "file.place", json!({"path": src}));
|
||||
assert_eq!(placed["linked"], true, "{placed}");
|
||||
save(&mut s, &dir.file("poster.vectorcraft"));
|
||||
std::fs::remove_dir_all(dir.0.join("art")).unwrap();
|
||||
let r = run(&mut s, "file.package", json!({"folder": dir.file("out")}));
|
||||
assert_eq!((r["links"].as_u64(), r["missingLinks"].clone()), (Some(1), json!([])), "{r}");
|
||||
let root = dir.0.join("out/poster Folder");
|
||||
assert_eq!(std::fs::read(root.join("Links/badge.ai")).unwrap(), ai, "the bytes the document holds");
|
||||
}
|
||||
|
||||
/// The PostScript bytes a document holds are copied for a placed document whose file name is one
|
||||
/// PostScript is read from, and not under any other name or for a linked image.
|
||||
#[test]
|
||||
fn package_copies_held_postscript_only_for_a_placed_document_with_a_postscript_name() {
|
||||
let dir = Folder::new("package-placed-ps-names");
|
||||
let eps = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 50\n%%EndComments\n1 0 0 setrgbcolor\nnewpath 0 0 moveto 100 0 lineto 100 50 lineto 0 50 lineto closepath fill\nshowpage\n%%EOF\n";
|
||||
let ai = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 50\n%%EndComments\n0 0 1 setrgbcolor\nnewpath 0 0 moveto 100 0 lineto 100 50 lineto 0 50 lineto closepath fill\nshowpage\n%%EOF\n";
|
||||
write(&dir.file("art/seal.eps"), eps);
|
||||
write(&dir.file("art/badge.ai"), ai);
|
||||
write(&dir.file("art/logo.png"), &png(8, 8, RED));
|
||||
let mut s = session();
|
||||
let seal = run(&mut s, "file.place", json!({"path": dir.file("art/seal.eps")}));
|
||||
assert_eq!(seal["linked"], true, "{seal}");
|
||||
let seal = vectorcraft_doc::NodeId(seal["ids"][0].as_u64().unwrap());
|
||||
run(&mut s, "file.place", json!({"path": dir.file("art/badge.ai")}));
|
||||
let logo = place(&mut s, &dir.file("art/logo.png"));
|
||||
let (tool, logo_ai) = (dir.file("art/tool.exe"), dir.file("art/logo.ai"));
|
||||
s.edit("names", |d, _| {
|
||||
let vectorcraft_doc::NodeKind::PlacedDocument(p) = &mut d.node_mut(seal).unwrap().kind else { panic!("not a placed document") };
|
||||
p.link.path = tool.clone();
|
||||
p.link.relative = None;
|
||||
let vectorcraft_doc::NodeKind::Image(im) = &mut d.node_mut(logo).unwrap().kind else { panic!("not an image") };
|
||||
im.link.as_mut().unwrap().path = logo_ai.clone();
|
||||
im.link.as_mut().unwrap().relative = None;
|
||||
let key = im.key.clone();
|
||||
d.images
|
||||
.insert(key, vectorcraft_doc::ImageBlob { mime: "application/postscript".into(), bytes: std::sync::Arc::new(eps.to_vec()), proxy: None });
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
save(&mut s, &dir.file("poster.vectorcraft"));
|
||||
std::fs::remove_dir_all(dir.0.join("art")).unwrap();
|
||||
let r = run(&mut s, "file.package", json!({"folder": dir.file("out")}));
|
||||
assert_eq!(r["links"].as_u64(), Some(1), "{r}");
|
||||
let mut missing: Vec<&str> = r["missingLinks"].as_array().unwrap().iter().filter_map(Value::as_str).collect();
|
||||
missing.sort_unstable();
|
||||
assert_eq!(missing, ["logo.ai", "tool.exe"], "{r}");
|
||||
let links = dir.0.join("out/poster Folder/Links");
|
||||
assert_eq!(std::fs::read(links.join("badge.ai")).unwrap(), ai, "a PostScript .ai under its own name");
|
||||
assert!(!links.join("tool.exe").exists(), "PostScript under a name it isn't read from");
|
||||
assert!(!links.join("logo.ai").exists(), "PostScript held for a linked image");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn package_copies_the_fonts_of_the_type_on_a_linked_pdf_page() {
|
||||
let dir = Folder::new("package-placed-pdf-type");
|
||||
|
||||
@@ -0,0 +1,311 @@
|
||||
//! Pathfinder on clip groups (#8093): a clip group's members take part only where its clipping
|
||||
//! path shows them, so Divide and the other operations leave out the hidden art.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_color::{Color, Paint};
|
||||
use vectorcraft_doc::NodeKind;
|
||||
use vectorcraft_geom::{FillRule, PathData, Rect};
|
||||
|
||||
use crate::*;
|
||||
|
||||
fn session() -> Session {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
|
||||
s
|
||||
}
|
||||
|
||||
fn id(v: &Value) -> NodeId {
|
||||
NodeId(v["id"].as_u64().unwrap_or_else(|| panic!("no id in {v}")))
|
||||
}
|
||||
|
||||
fn rect(s: &mut Session, x: f64, y: f64, w: f64, h: f64, fill: Color) -> NodeId {
|
||||
let r = id(&s.execute("shape.rectangle", &json!({"x": x, "y": y, "width": w, "height": h})).unwrap());
|
||||
s.edit("fill", |d, _| {
|
||||
d.node_mut(r).unwrap().appearance.set_fill(Paint::solid(fill));
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
r
|
||||
}
|
||||
|
||||
fn clip(s: &mut Session, ids: &[NodeId]) -> NodeId {
|
||||
id(&s.execute("object.clippingMask.make", &json!({"ids": ids.iter().map(|i| i.0).collect::<Vec<_>>()})).unwrap())
|
||||
}
|
||||
|
||||
fn red() -> Color {
|
||||
Color::rgb(1.0, 0.0, 0.0)
|
||||
}
|
||||
|
||||
fn blue() -> Color {
|
||||
Color::rgb(0.0, 0.0, 1.0)
|
||||
}
|
||||
|
||||
fn green() -> Color {
|
||||
Color::rgb(0.0, 1.0, 0.0)
|
||||
}
|
||||
|
||||
/// A red square at (0, 0) and a blue one at (50, 50), both 100 pt, clipped by a 100 pt square
|
||||
/// mask at (25, 25): the clip group. The mask shows 8750 pt² of them.
|
||||
fn clipped_pair(s: &mut Session) -> NodeId {
|
||||
let a = rect(s, 0.0, 0.0, 100.0, 100.0, red());
|
||||
let b = rect(s, 50.0, 50.0, 100.0, 100.0, blue());
|
||||
let mask = rect(s, 25.0, 25.0, 100.0, 100.0, green());
|
||||
clip(s, &[a, b, mask])
|
||||
}
|
||||
|
||||
/// The shapes `op` makes of the selection, the members of the group it makes or the one shape:
|
||||
/// (fill, path, rule) each.
|
||||
fn pieces(s: &mut Session, op: &str) -> Vec<(Paint, PathData, FillRule)> {
|
||||
let r = s.execute(op, &json!({})).unwrap();
|
||||
let g = s.doc().unwrap().doc.node(NodeId(r["ids"][0].as_u64().unwrap())).cloned().unwrap();
|
||||
let shape = |n: &vectorcraft_doc::Node| match &n.kind {
|
||||
NodeKind::Path { path, rule, .. } => (n.appearance.fill_paint(), path.clone(), *rule),
|
||||
NodeKind::Compound { children, rule } => {
|
||||
let subs = children.iter().flat_map(|c| c.path_data().unwrap().subpaths.clone()).collect();
|
||||
(n.appearance.fill_paint(), PathData::new(subs), *rule)
|
||||
}
|
||||
k => panic!("not a path: {k:?}"),
|
||||
};
|
||||
match &g.kind {
|
||||
NodeKind::Group { children, .. } => children.iter().map(|c| shape(c)).collect(),
|
||||
_ => vec![shape(&g)],
|
||||
}
|
||||
}
|
||||
|
||||
fn area(p: &(Paint, PathData, FillRule)) -> f64 {
|
||||
vectorcraft_pathops::area(&p.1, p.2)
|
||||
}
|
||||
|
||||
fn bounds(ps: &[(Paint, PathData, FillRule)]) -> Rect {
|
||||
ps.iter().filter_map(|p| p.1.bounds()).reduce(|a, b| a.union(b)).unwrap()
|
||||
}
|
||||
|
||||
fn select(s: &mut Session, ids: &[NodeId]) {
|
||||
s.execute("select.set", &json!({"ids": ids.iter().map(|i| i.0).collect::<Vec<_>>()})).unwrap();
|
||||
}
|
||||
|
||||
fn assert_inside(r: Rect, within: Rect) {
|
||||
assert!(within.inflate(1e-6, 1e-6).contains_rect(r), "{r:?} reaches out of {within:?}");
|
||||
}
|
||||
|
||||
/// The issue's case: Divide on a clip group gives the pieces the mask shows, cut along it, and the
|
||||
/// hidden art goes.
|
||||
#[test]
|
||||
fn divide_on_a_clip_group_keeps_only_what_the_mask_shows() {
|
||||
let mut s = session();
|
||||
let g = clipped_pair(&mut s);
|
||||
select(&mut s, &[g]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.divide");
|
||||
assert_eq!(ps.len(), 3, "red alone, the overlap and blue alone: {ps:?}");
|
||||
let total: f64 = ps.iter().map(area).sum();
|
||||
assert!((total - 8750.0).abs() < 1.0, "the visible area, not the whole art: {total}");
|
||||
assert_inside(bounds(&ps), Rect::new(25.0, 25.0, 125.0, 125.0));
|
||||
let blue: f64 = ps.iter().filter(|p| p.0 == Paint::solid(blue())).map(area).sum();
|
||||
assert!((blue - 5625.0).abs() < 1.0, "the overlap takes the front (blue) fill: {blue}");
|
||||
assert!(ps.iter().all(|p| p.0 != Paint::solid(green())), "the clipping path adds no piece: {ps:?}");
|
||||
}
|
||||
|
||||
/// An irregular mask: a square clipped by a circle divides into a disc.
|
||||
#[test]
|
||||
fn divide_cuts_along_a_curved_clipping_path() {
|
||||
let mut s = session();
|
||||
let square = rect(&mut s, 100.0, 100.0, 300.0, 300.0, red());
|
||||
let circle = id(&s.execute("shape.ellipse", &json!({"x": 150, "y": 150, "width": 200, "height": 200})).unwrap());
|
||||
let g = clip(&mut s, &[square, circle]);
|
||||
select(&mut s, &[g]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.divide");
|
||||
assert_eq!(ps.len(), 1, "{ps:?}");
|
||||
let disc = std::f64::consts::PI * 100.0 * 100.0;
|
||||
assert!((area(&ps[0]) - disc).abs() < disc * 1e-3, "{} vs {disc}", area(&ps[0]));
|
||||
assert_inside(bounds(&ps), Rect::new(150.0, 150.0, 350.0, 350.0));
|
||||
}
|
||||
|
||||
/// A clip group inside a clip group: its members show only where both masks do.
|
||||
#[test]
|
||||
fn nested_clip_groups_cut_by_both_masks() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 0.0, 0.0, 200.0, 200.0, red());
|
||||
let inner_mask = rect(&mut s, 0.0, 0.0, 100.0, 200.0, green());
|
||||
let inner = clip(&mut s, &[a, inner_mask]);
|
||||
let outer_mask = rect(&mut s, 0.0, 50.0, 200.0, 100.0, green());
|
||||
let outer = clip(&mut s, &[inner, outer_mask]);
|
||||
select(&mut s, &[outer]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.divide");
|
||||
assert_eq!(ps.len(), 1, "{ps:?}");
|
||||
assert!((area(&ps[0]) - 10000.0).abs() < 1.0, "100 × 100 shows: {}", area(&ps[0]));
|
||||
assert_inside(bounds(&ps), Rect::new(0.0, 50.0, 100.0, 150.0));
|
||||
}
|
||||
|
||||
/// A member the mask hides altogether gives no piece.
|
||||
#[test]
|
||||
fn a_member_the_mask_hides_gives_no_piece() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0, red());
|
||||
let b = rect(&mut s, 300.0, 300.0, 100.0, 100.0, blue());
|
||||
let mask = rect(&mut s, 0.0, 0.0, 150.0, 150.0, green());
|
||||
let g = clip(&mut s, &[a, b, mask]);
|
||||
select(&mut s, &[g]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.divide");
|
||||
assert_eq!(ps.len(), 1, "only the red square shows: {ps:?}");
|
||||
assert_eq!(ps[0].0, Paint::solid(red()));
|
||||
}
|
||||
|
||||
/// A cutting line in a clip group cuts only where the mask shows it: its hidden part leaves the
|
||||
/// other selected art alone.
|
||||
#[test]
|
||||
fn a_clipped_cutting_line_cuts_only_where_it_shows() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0, red());
|
||||
let line = id(&s.execute("shape.line", &json!({"x1": 50, "y1": -50, "x2": 50, "y2": 400})).unwrap());
|
||||
let mask = rect(&mut s, 0.0, 0.0, 100.0, 100.0, green());
|
||||
let g = clip(&mut s, &[a, line, mask]);
|
||||
let other = rect(&mut s, 0.0, 200.0, 100.0, 100.0, blue());
|
||||
select(&mut s, &[g, other]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.divide");
|
||||
let red = ps.iter().filter(|p| p.0 == Paint::solid(red())).count();
|
||||
let blue = ps.iter().filter(|p| p.0 == Paint::solid(blue())).count();
|
||||
assert_eq!((red, blue), (2, 1), "the line halves the red square, not the blue one: {ps:?}");
|
||||
}
|
||||
|
||||
/// Every Shape Mode and Pathfinder button takes the members as the mask shows them (#3367 asks
|
||||
/// this of Merge). The mask, 100 × 60 pt at (25, 25), cuts through the squares' overlap: it shows
|
||||
/// 4500 pt² of red, 2625 pt² of blue and 1750 pt² of their overlap.
|
||||
#[test]
|
||||
fn every_operation_takes_only_what_the_mask_shows() {
|
||||
for (op, want) in [
|
||||
("unite", Some(5375.0)),
|
||||
("minusFront", Some(2750.0)),
|
||||
("minusBack", Some(875.0)),
|
||||
("intersect", Some(1750.0)),
|
||||
("exclude", Some(3625.0)),
|
||||
("trim", Some(5375.0)),
|
||||
("merge", Some(5375.0)),
|
||||
("crop", Some(1750.0)),
|
||||
("outline", None),
|
||||
] {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0, red());
|
||||
let b = rect(&mut s, 50.0, 50.0, 100.0, 100.0, blue());
|
||||
let mask = rect(&mut s, 25.0, 25.0, 100.0, 60.0, green());
|
||||
let g = clip(&mut s, &[a, b, mask]);
|
||||
select(&mut s, &[g]);
|
||||
let ps = pieces(&mut s, &format!("object.pathfinder.{op}"));
|
||||
assert_inside(bounds(&ps), Rect::new(25.0, 25.0, 125.0, 85.0));
|
||||
if let Some(want) = want {
|
||||
let total: f64 = ps.iter().map(area).sum();
|
||||
assert!((total - want).abs() < 1.0, "{op}: {total}, want {want}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Among other objects a clip group acts as one shape: the union of what its mask shows.
|
||||
#[test]
|
||||
fn a_clip_group_among_other_objects_is_the_area_its_mask_shows() {
|
||||
let mut s = session();
|
||||
let g = clipped_pair(&mut s);
|
||||
let other = rect(&mut s, 300.0, 0.0, 50.0, 50.0, blue());
|
||||
select(&mut s, &[g, other]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.unite");
|
||||
let total: f64 = ps.iter().map(area).sum();
|
||||
assert!((total - (8750.0 + 2500.0)).abs() < 1.0, "{total}");
|
||||
}
|
||||
|
||||
/// Among other objects a clip group takes the style of its top member that shows: a member the
|
||||
/// mask hides paints nothing.
|
||||
#[test]
|
||||
fn a_hidden_top_member_gives_no_style() {
|
||||
let mut s = session();
|
||||
// Below the clip group, so the result takes the group's style.
|
||||
let other = rect(&mut s, 50.0, 50.0, 100.0, 100.0, green());
|
||||
let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0, red());
|
||||
let b = rect(&mut s, 300.0, 300.0, 100.0, 100.0, blue());
|
||||
let mask = rect(&mut s, 0.0, 0.0, 150.0, 150.0, green());
|
||||
let g = clip(&mut s, &[a, b, mask]);
|
||||
select(&mut s, &[other, g]);
|
||||
let ps = pieces(&mut s, "object.pathfinder.unite");
|
||||
assert_eq!(ps.len(), 1, "{ps:?}");
|
||||
assert_eq!(ps[0].0, Paint::solid(red()), "not the hidden blue member's fill");
|
||||
assert!((area(&ps[0]) - 17500.0).abs() < 1.0, "{}", area(&ps[0]));
|
||||
}
|
||||
|
||||
/// A selection the masks hide altogether says so.
|
||||
#[test]
|
||||
fn art_the_masks_hide_altogether_is_refused_with_a_reason() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 300.0, 300.0, 100.0, 100.0, red());
|
||||
let mask = rect(&mut s, 0.0, 0.0, 100.0, 100.0, green());
|
||||
let g = clip(&mut s, &[a, mask]);
|
||||
select(&mut s, &[g]);
|
||||
let undo = s.doc().unwrap().history.undo.len();
|
||||
let e = s.execute("object.pathfinder.divide", &json!({})).unwrap_err().to_string();
|
||||
assert!(e.contains("clipping masks hide"), "{e}");
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "nothing changes");
|
||||
}
|
||||
|
||||
/// A clip group its mask hides altogether, selected with a red square at (0, 0) and a blue one at
|
||||
/// (50, 50), each 100 pt, at `position` in the stacking order (0: at the back).
|
||||
fn with_a_hidden_clip_group(s: &mut Session, position: usize) {
|
||||
let mut ids = vec![];
|
||||
for i in 0..3 {
|
||||
if i == position {
|
||||
// Two members, so among other objects the group is one shape: their union.
|
||||
let a = rect(s, 300.0, 300.0, 100.0, 100.0, green());
|
||||
let b = rect(s, 450.0, 300.0, 100.0, 100.0, green());
|
||||
let mask = rect(s, 0.0, 0.0, 100.0, 100.0, green());
|
||||
ids.push(clip(s, &[a, b, mask]));
|
||||
} else {
|
||||
let at = if ids.len() == usize::from(position == 0) { 0.0 } else { 50.0 };
|
||||
ids.push(rect(s, at, at, 100.0, 100.0, if at == 0.0 { red() } else { blue() }));
|
||||
}
|
||||
}
|
||||
select(s, &ids);
|
||||
}
|
||||
|
||||
/// A selected object its masks hide altogether is an empty operand: Intersect, Minus Front with
|
||||
/// it at the back, Minus Back with it in front and Crop with it on top give nothing, and the other
|
||||
/// operations make what they make without it.
|
||||
#[test]
|
||||
fn a_hidden_operand_is_an_empty_shape_where_it_changes_the_result() {
|
||||
for (op, position) in [("intersect", 1), ("minusFront", 0), ("minusBack", 2), ("crop", 2)] {
|
||||
let mut s = session();
|
||||
with_a_hidden_clip_group(&mut s, position);
|
||||
let undo = s.doc().unwrap().history.undo.len();
|
||||
let e = s.execute(&format!("object.pathfinder.{op}"), &json!({})).unwrap_err().to_string();
|
||||
assert!(e.contains("empty result"), "{op}: {e}");
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "{op}: nothing changes");
|
||||
}
|
||||
for (op, position, want) in [("unite", 2, 17500.0), ("exclude", 2, 15000.0), ("minusFront", 2, 7500.0), ("minusBack", 0, 7500.0)] {
|
||||
let mut s = session();
|
||||
with_a_hidden_clip_group(&mut s, position);
|
||||
let ps = pieces(&mut s, &format!("object.pathfinder.{op}"));
|
||||
let total: f64 = ps.iter().map(area).sum();
|
||||
assert!((total - want).abs() < 1.0, "{op}: {total}, want {want}");
|
||||
assert!(ps.iter().all(|p| p.0 != Paint::solid(green())), "{op}: the hidden group's style: {ps:?}");
|
||||
}
|
||||
}
|
||||
|
||||
/// A clip group whose clipping path clips by nothing (here an empty group) hides its members, as on
|
||||
/// the canvas: they are a hidden operand too, not left out of the selection.
|
||||
#[test]
|
||||
fn a_clipping_path_that_clips_by_nothing_hides_the_members() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0, red());
|
||||
let b = rect(&mut s, 50.0, 50.0, 100.0, 100.0, blue());
|
||||
let m1 = rect(&mut s, 300.0, 300.0, 100.0, 100.0, green());
|
||||
let m2 = rect(&mut s, 450.0, 300.0, 100.0, 100.0, green());
|
||||
let mask = rect(&mut s, 300.0, 300.0, 300.0, 100.0, green());
|
||||
let g = clip(&mut s, &[m1, m2, mask]);
|
||||
s.edit("empty clipping path", |d, _| {
|
||||
let empty = vectorcraft_doc::Node::group(d.alloc_id(), vec![]);
|
||||
let NodeKind::Group { children, .. } = &mut d.node_mut(g).unwrap().kind else { panic!("not a group") };
|
||||
children[0] = std::sync::Arc::new(empty);
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
select(&mut s, &[a, b, g]);
|
||||
let e = s.execute("object.pathfinder.intersect", &json!({})).unwrap_err().to_string();
|
||||
assert!(e.contains("empty result"), "not the squares' overlap: {e}");
|
||||
select(&mut s, &[g]);
|
||||
let e = s.execute("object.pathfinder.divide", &json!({})).unwrap_err().to_string();
|
||||
assert!(e.contains("clipping masks hide"), "{e}");
|
||||
}
|
||||
@@ -926,6 +926,190 @@ fn a_pdf_compatible_ai_file_places_linked_like_a_pdf() {
|
||||
assert_eq!(images, 0);
|
||||
}
|
||||
|
||||
/// An EPS file written by hand at `path`: a 100×50 bounding box holding a 40×20 rectangle of `rgb`
|
||||
/// from (20, 10), and `extra` comment lines (which change the file's size).
|
||||
fn eps_source(path: &str, rgb: [u8; 3], extra: usize) {
|
||||
let [r, g, b] = rgb.map(|c| c as f64 / 255.0);
|
||||
let mut ps = format!(
|
||||
"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 50\n%%EndComments\n{r} {g} {b} setrgbcolor\nnewpath 20 10 moveto 60 10 lineto 60 30 lineto 20 30 lineto closepath fill\n"
|
||||
);
|
||||
for i in 0..extra {
|
||||
ps.push_str(&format!("% line {i}\n"));
|
||||
}
|
||||
ps.push_str("showpage\n%%EOF\n");
|
||||
write(path, ps.as_bytes());
|
||||
}
|
||||
|
||||
/// An EPS file at `path` written by VectorCraft's EPS export: a 100×50 artboard filled with `rgb`
|
||||
/// (`extra` more rectangles change the file's size).
|
||||
fn exported_eps(path: &str, rgb: [u8; 3], extra: usize) {
|
||||
let mut d = Document::new(100.0, 50.0);
|
||||
let layer = d.layers[0].id;
|
||||
for _ in 0..=extra {
|
||||
let id = d.alloc_id();
|
||||
d.insert(Some(layer), usize::MAX, Node::path(id, shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 50.0)), look(rgb))).unwrap();
|
||||
}
|
||||
write(path, &cmd::fileio::encode_all(&d, "eps", &json!({})).unwrap().files[0].1);
|
||||
}
|
||||
|
||||
/// The kinds of `n` and everything inside it, in order.
|
||||
fn kinds(n: &Node) -> Vec<&'static str> {
|
||||
let mut k = vec![];
|
||||
n.walk(&mut |c| k.push(c.kind_label()));
|
||||
k
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn with_link_an_eps_file_places_linked_framed_as_without_link() {
|
||||
let dir = Folder::new("placed-eps-linked");
|
||||
let src = dir.file("badge.eps");
|
||||
eps_source(&src, RED, 0);
|
||||
let mut s = session();
|
||||
let embedded = |s: &mut Session, crop: &str| {
|
||||
let r = s.execute("file.place", &json!({"path": src, "link": false, "crop": crop, "at": [200, 150]})).unwrap();
|
||||
assert_eq!(r["linked"], false, "{r}");
|
||||
let n = s.doc().unwrap().doc.node(NodeId(r["ids"][0].as_u64().unwrap())).unwrap().clone();
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
n
|
||||
};
|
||||
let copy = embedded(&mut s, "crop");
|
||||
let id = place(&mut s, &src);
|
||||
let p = placed(&s, id);
|
||||
assert_eq!((p.link.path.as_str(), p.link.page, p.bounding), (src.as_str(), Some(1), false), "{p:?}");
|
||||
assert!((p.width - 100.0).abs() < 1e-6 && (p.height - 50.0).abs() < 1e-6, "{p:?}");
|
||||
assert_eq!(Some(bounds(&s, id)), copy.geometric_bounds(), "the bounding box, as without Link");
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED));
|
||||
let row = &s.execute("links.list", &json!({})).unwrap()["links"][0];
|
||||
assert_eq!((row["format"].as_str(), row["document"].as_bool(), row["status"].as_str()), (Some("EPS"), Some(true), Some("ok")), "{row}");
|
||||
assert_eq!(s.doc().unwrap().doc.images[&p.key].mime, "application/postscript");
|
||||
// Break Link gives the group placing it without Link gives.
|
||||
let r = s.execute("links.embed", &json!({"ids": [id.0]})).unwrap();
|
||||
assert_eq!(r["embedded"], json!([id.0]), "{r}");
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
assert_eq!((kinds(&n), n.geometric_bounds()), (kinds(©), copy.geometric_bounds()));
|
||||
assert!(!s.doc().unwrap().doc.has_placed() && near(centre_colour(&s.doc().unwrap().doc), RED));
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
// Bounding Box: the art's bounds, as without Link.
|
||||
let copy = embedded(&mut s, "bounding");
|
||||
let r = s.execute("file.place", &json!({"path": src, "crop": "bounding", "at": [200, 150]})).unwrap();
|
||||
assert_eq!(r["linked"], true, "{r}");
|
||||
let id = NodeId(r["ids"][0].as_u64().unwrap());
|
||||
let p = placed(&s, id);
|
||||
assert!(p.bounding && (p.width - 40.0).abs() < 1e-6 && (p.height - 20.0).abs() < 1e-6, "{p:?}");
|
||||
assert_eq!(Some(bounds(&s, id)), copy.geometric_bounds());
|
||||
// Object › Expand gives it too (the placed object is selected).
|
||||
let r = s.execute("object.expand", &json!({})).unwrap();
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
assert_eq!((kinds(&n), n.geometric_bounds()), (kinds(©), copy.geometric_bounds()), "{r}");
|
||||
// Placed from its bytes, it is embedded.
|
||||
let data = vectorcraft_format::base64_encode(&std::fs::read(&src).unwrap());
|
||||
let r = s.execute("file.place", &json!({"name": "badge.eps", "dataBase64": data})).unwrap();
|
||||
assert_eq!(r["linked"], false, "{r}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_changed_eps_file_is_modified_and_update_links_reads_it_again() {
|
||||
let dir = Folder::new("placed-eps-update");
|
||||
let src = dir.file("flyer.eps");
|
||||
exported_eps(&src, RED, 0);
|
||||
let mut s = session();
|
||||
let id = place(&mut s, &src);
|
||||
exported_eps(&src, BLUE, 1);
|
||||
assert_eq!(s.execute("links.check", &json!({})).unwrap()["links"][0]["status"], "modified");
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED), "shows the file as it read it");
|
||||
let u = s.execute("links.update", &json!({})).unwrap();
|
||||
assert_eq!(u["updated"], json!([id.0]), "{u}");
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), BLUE));
|
||||
assert_eq!(s.execute("links.check", &json!({})).unwrap()["modified"], 0);
|
||||
// Relinked to another EPS file, it shows that file's art.
|
||||
let other = dir.file("other.eps");
|
||||
eps_source(&other, RED, 0);
|
||||
let r = s.execute("links.relink", &json!({"ids": [id.0], "path": other})).unwrap();
|
||||
assert_eq!(r["relinked"], json!([id.0]), "{r}");
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED));
|
||||
// A file it can't show is refused.
|
||||
let notes = dir.file("notes.txt");
|
||||
write(¬es, b"not a page");
|
||||
let e = s.execute("links.relink", &json!({"ids": [id.0], "path": notes})).unwrap_err().to_string();
|
||||
assert!(e.contains("isn't a VectorCraft document"), "{e}");
|
||||
assert_eq!(placed(&s, id).link.path, other);
|
||||
// Its file replaced by one that isn't PostScript: updating keeps the art it shows.
|
||||
write(&other, b"not a page");
|
||||
let _ = s.execute("links.update", &json!({}));
|
||||
assert_eq!(placed(&s, id).link.path, other);
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_linked_eps_file_outputs_as_vectors_and_shows_its_preview_without_its_file() {
|
||||
let dir = Folder::new("placed-eps-outputs");
|
||||
let src = dir.file("seal.eps");
|
||||
// Content of its own: files read are cached by content, and this one is removed.
|
||||
eps_source(&src, RED, 3);
|
||||
let bytes = std::fs::read(&src).unwrap();
|
||||
let mut s = session();
|
||||
let id = place(&mut s, &src);
|
||||
let doc_path = dir.file("poster.vectorcraft");
|
||||
save(&mut s, &doc_path);
|
||||
// Without its file: missing, shown and output as its preview, and not embedded.
|
||||
std::fs::remove_file(&src).unwrap();
|
||||
open(&mut s, &doc_path);
|
||||
let key = placed(&s, id).key;
|
||||
assert!(s.doc().unwrap().doc.images[&key].is_proxy(), "opened with the preview only");
|
||||
let row = &s.execute("links.list", &json!({})).unwrap()["links"][0];
|
||||
assert_eq!((row["format"].as_str(), row["status"].as_str()), (Some("EPS"), Some("missing")), "{row}");
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED), "the preview");
|
||||
let pdf = s.execute("document.serialize", &json!({"format": "pdf"})).unwrap();
|
||||
assert!(pdf["warnings"].to_string().contains("1 placed document output as its preview"), "{}", pdf["warnings"]);
|
||||
let r = s.execute("links.embed", &json!({"ids": [id.0]})).unwrap();
|
||||
assert_eq!((r["embedded"].clone(), r["missing"].clone()), (json!([]), json!([id.0])), "{r}");
|
||||
assert!(s.doc().unwrap().doc.has_placed());
|
||||
// The file back: output reads it again, its paths and not the preview.
|
||||
write(&src, &bytes);
|
||||
assert_eq!(s.execute("links.check", &json!({})).unwrap()["links"][0]["status"], "ok");
|
||||
let pdf = s.execute("document.serialize", &json!({"format": "pdf"})).unwrap();
|
||||
assert_eq!(pdf["warnings"], json!([]), "{}", pdf["warnings"]);
|
||||
let (images, paths) = pdf_contents(&decode(&pdf));
|
||||
assert_eq!(images, 0, "no image in the PDF");
|
||||
assert!(paths > 0);
|
||||
// Include Linked Files keeps the EPS file itself.
|
||||
let full = file_json(&decode(&s.execute("document.serialize", &json!({"format": "vectorcraft", "includeLinked": true})).unwrap()));
|
||||
assert_eq!((full["images"][&key]["proxy"].clone(), full["images"][&key]["mime"].as_str()), (Value::Null, Some("application/postscript")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_postscript_ai_file_places_linked_like_an_eps_file() {
|
||||
let dir = Folder::new("placed-ps-ai-linked");
|
||||
let src = dir.file("badge.ai");
|
||||
eps_source(&src, RED, 0);
|
||||
let mut s = session();
|
||||
let id = place(&mut s, &src);
|
||||
assert_eq!(placed(&s, id).link.path, src);
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED));
|
||||
let row = &s.execute("links.list", &json!({})).unwrap()["links"][0];
|
||||
assert_eq!(row["format"], "PostScript", "{row}");
|
||||
eps_source(&src, BLUE, 5);
|
||||
let u = s.execute("links.update", &json!({})).unwrap();
|
||||
assert_eq!(u["updated"], json!([id.0]), "{u}");
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), BLUE));
|
||||
// Saved with its preview only and reopened without its file, it is still listed as PostScript.
|
||||
let bytes = std::fs::read(&src).unwrap();
|
||||
let doc_path = dir.file("poster.vectorcraft");
|
||||
save(&mut s, &doc_path);
|
||||
std::fs::remove_file(&src).unwrap();
|
||||
open(&mut s, &doc_path);
|
||||
assert!(s.doc().unwrap().doc.images[&placed(&s, id).key].is_proxy(), "opened with the preview only");
|
||||
let row = &s.execute("links.list", &json!({})).unwrap()["links"][0];
|
||||
assert_eq!((row["format"].as_str(), row["status"].as_str()), (Some("PostScript"), Some("missing")), "{row}");
|
||||
write(&src, &bytes);
|
||||
// The same bytes named .eps are read as an EPS file: a file of their own, not the .ai's art.
|
||||
let eps = dir.file("badge.eps");
|
||||
write(&eps, &std::fs::read(&src).unwrap());
|
||||
let other = place(&mut s, &eps);
|
||||
assert_ne!(placed(&s, other).key, placed(&s, id).key);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_placed_document_inside_a_placed_document_outputs_from_its_own_file() {
|
||||
let dir = Folder::new("placed-nested");
|
||||
|
||||
@@ -149,6 +149,72 @@ fn a_shape_tool_turns_the_shape_from_just_outside_a_corner() {
|
||||
assert_eq!(angle(&s, id), 0.0, "rounding does not turn it");
|
||||
}
|
||||
|
||||
/// How many objects the first layer holds.
|
||||
fn objects(s: &Session) -> usize {
|
||||
s.doc().unwrap().doc.layers[0].children().map(|c| c.len()).unwrap_or_default()
|
||||
}
|
||||
|
||||
/// Feed the pointer events `(kind, x, y, backtick held)` to the active tool, with no modifier.
|
||||
fn quote_gesture(s: &mut Session, events: &[(PointerKind, f64, f64, bool)]) {
|
||||
for (k, x, y, held) in events {
|
||||
s.pointer(&PointerEvent { backquote: *held, ..PointerEvent::new(*k, *x, *y) }, view()).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
/// A Rectangle tool drag from (50, 50) with Backtick held from (100, 100) to (140, 100), let go
|
||||
/// before (160, 120), all moved by `o` along both axes: two copies, 70 × 50 and 90 × 50 pt, and
|
||||
/// the 110 × 70 pt rectangle it ends with. With `release`, the drag is let go; without, it is
|
||||
/// still in progress.
|
||||
fn trail(s: &mut Session, o: f64, release: bool) {
|
||||
use PointerKind::{Down, Drag, Up};
|
||||
quote_gesture(
|
||||
s,
|
||||
&[
|
||||
(Down, 50.0 + o, 50.0 + o, false),
|
||||
(Drag, 100.0 + o, 100.0 + o, true),
|
||||
(Drag, 120.0 + o, 100.0 + o, true),
|
||||
(Drag, 140.0 + o, 100.0 + o, true),
|
||||
],
|
||||
);
|
||||
quote_gesture(s, &[(Drag, 160.0 + o, 120.0 + o, false)]);
|
||||
if release {
|
||||
quote_gesture(s, &[(Up, 160.0 + o, 120.0 + o, false)]);
|
||||
}
|
||||
}
|
||||
|
||||
/// The sizes of the first layer's objects, back to front.
|
||||
fn sizes(s: &Session) -> Vec<(f64, f64)> {
|
||||
let ids: Vec<NodeId> = s.doc().unwrap().doc.layers[0].children().map(|c| c.iter().map(|n| n.id).collect()).unwrap_or_default();
|
||||
ids.into_iter().map(|id| bounds(s, id)).map(|r| (r.width(), r.height())).collect()
|
||||
}
|
||||
|
||||
/// Backtick held while a rectangle is dragged out leaves copies of it along the drag: each its own
|
||||
/// object, and the release keeps them with the last rectangle as one undo step, with Real-time
|
||||
/// Drawing and Editing on or off. Escape takes the copies back with the shape being drawn.
|
||||
#[test]
|
||||
fn a_backtick_drag_leaves_copies_of_the_shape_as_one_undo_step() {
|
||||
for real_time in [true, false] {
|
||||
let mut s = new_doc();
|
||||
s.execute("prefs.set", &json!({"key": "realTimeDrawing", "value": real_time})).unwrap();
|
||||
s.select_tool("rectangle", view()).unwrap();
|
||||
let steps = undo_steps(&s);
|
||||
trail(&mut s, 0.0, true);
|
||||
assert_eq!(sizes(&s), vec![(70.0, 50.0), (90.0, 50.0), (110.0, 70.0)], "real time {real_time}");
|
||||
assert_eq!(undo_steps(&s), steps + 1, "one undo step");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(objects(&s), 0, "Undo takes all three back");
|
||||
s.execute("edit.redo", &json!({})).unwrap();
|
||||
assert_eq!(objects(&s), 3, "Redo puts all three back");
|
||||
// Escape takes back the copies and the shape being drawn, away from the selection.
|
||||
let steps = undo_steps(&s);
|
||||
trail(&mut s, 200.0, false);
|
||||
s.tool_key(ToolKey::Escape, NONE, view()).unwrap();
|
||||
quote_gesture(&mut s, &[(PointerKind::Up, 360.0, 320.0, false)]);
|
||||
assert_eq!(objects(&s), 3, "real time {real_time}: nothing new");
|
||||
assert_eq!(undo_steps(&s), steps, "no step");
|
||||
}
|
||||
}
|
||||
|
||||
/// The Selection tool takes the centre point of an unfilled shape too: a drag there moves it
|
||||
/// instead of starting a marquee.
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user