mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-18 16:19:08 +00:00
Merge pull request #8443 from dotCooCoo/perf/dxf-artboards-bake-once
DXF: Use Artboards applies live effects once for all the drawings
This commit is contained in:
@@ -226,9 +226,10 @@ pub(super) fn encode(doc: &Document, p: &Value, use_artboards: Option<bool>) ->
|
||||
vec![(Some(b), rect(b)?, false)]
|
||||
}
|
||||
};
|
||||
let regions: Vec<(Rect, bool)> = drawings.iter().map(|&(_, region, crop)| (region, crop)).collect();
|
||||
let outs = vectorcraft_cad::export_drawings(doc, &opts, ®ions).map_err(|e| bad(C, e))?;
|
||||
let mut enc = Encoded::default();
|
||||
for (board, region, crop) in drawings {
|
||||
let out = vectorcraft_cad::export(doc, &DxfOptions { region, crop, ..opts.clone() }).map_err(|e| bad(C, e))?;
|
||||
for ((board, _, _), out) in drawings.into_iter().zip(outs) {
|
||||
enc.files.push((board, out.bytes));
|
||||
for w in out.warnings {
|
||||
if !enc.warnings.contains(&w) {
|
||||
|
||||
@@ -116,6 +116,24 @@ fn use_artboards_writes_one_drawing_per_artboard() {
|
||||
assert!(e.contains("useArtboards"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn each_artboard_s_drawing_is_the_drawing_of_that_artboard_alone() {
|
||||
let mut s = two_boards();
|
||||
// A second rectangle on the second artboard, so the two drawings differ.
|
||||
let second = s.doc().unwrap().doc.artboards[1].rect.x0;
|
||||
s.execute("shape.rectangle", &json!({"x": second + 50.0, "y": 50, "width": 20, "height": 20})).unwrap();
|
||||
let r = s.execute("document.export", &json!({"format": "dxf", "useArtboards": true, "unit": "pt"})).unwrap();
|
||||
let files = r["files"].as_array().unwrap();
|
||||
let doc = &s.doc().unwrap().doc;
|
||||
let o = dxf::options(&json!({"unit": "pt"})).unwrap();
|
||||
assert_eq!(files.len(), doc.artboards.len());
|
||||
assert_ne!(b64(&files[0]), b64(&files[1]));
|
||||
for (f, board) in files.iter().zip(&doc.artboards) {
|
||||
let alone = vectorcraft_cad::export(doc, &vectorcraft_cad::DxfOptions { region: board.rect, crop: true, ..o.clone() }).unwrap();
|
||||
assert_eq!(b64(f), alone.bytes, "{}", f["name"]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn selected_only_exports_the_selection_in_its_layers() {
|
||||
let mut s = two_boards();
|
||||
|
||||
Reference in New Issue
Block a user