diff options
author | jaseg <git@jaseg.de> | 2021-08-17 22:55:47 +0200 |
---|---|---|
committer | jaseg <git@jaseg.de> | 2021-08-17 22:55:47 +0200 |
commit | 236c4a44855b93c0dd4dc8e5e2ab80380b595046 (patch) | |
tree | cb2f7986208729866199e2916da9f9c67ba1dca2 /svg-flatten/src/svg_doc.cpp | |
parent | 4ffb4c65825ab0a5ded00ff799b494097e7bd143 (diff) | |
download | gerbolyze-236c4a44855b93c0dd4dc8e5e2ab80380b595046.tar.gz gerbolyze-236c4a44855b93c0dd4dc8e5e2ab80380b595046.tar.bz2 gerbolyze-236c4a44855b93c0dd4dc8e5e2ab80380b595046.zip |
svg-flatten: Fix case where document unit is not mm
Diffstat (limited to 'svg-flatten/src/svg_doc.cpp')
-rw-r--r-- | svg-flatten/src/svg_doc.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/svg-flatten/src/svg_doc.cpp b/svg-flatten/src/svg_doc.cpp index e59a7cc..865086f 100644 --- a/svg-flatten/src/svg_doc.cpp +++ b/svg-flatten/src/svg_doc.cpp @@ -383,19 +383,23 @@ void gerbolyze::SVGDocument::export_svg_path(xform2d &mat, const RenderSettings void gerbolyze::SVGDocument::render(const RenderSettings &rset, PolygonSink &sink, const ElementSelector *sel) { assert(_valid); - /* Export the actual SVG document to both SVG for debuggin and to gerber. We do this as we go, i.e. we immediately - * process each element to gerber as we encounter it instead of first rendering everything to a giant list of gerber - * primitives and then serializing those later. Exporting them on the fly saves a ton of memory and is much faster. + /* Export the actual SVG document. We do this as we go, i.e. we immediately process each element to gerber as we + * encounter it instead of first rendering everything to a giant list of gerber primitives and then serializing + * those later. Exporting them on the fly saves a ton of memory and is much faster. */ - polygon_sink = &sink; - sink.header({vb_x, vb_y}, {vb_w, vb_h}); + + /* Scale document pixels to mm for sinks */ + Scaler scaler(sink, doc_units_to_mm(1.0)); + + polygon_sink = &scaler; + scaler.header({vb_x, vb_y}, {vb_w, vb_h}); ClipperLib::Clipper c; c.AddPaths(vb_paths, ptSubject, /* closed */ true); ClipperLib::IntRect bbox = c.GetBounds(); cerr << "document viewbox clip: bbox={" << bbox.left << ", " << bbox.top << "} - {" << bbox.right << ", " << bbox.bottom << "}" << endl; xform2d xf; export_svg_group(xf, rset, root_elem, vb_paths, sel, false, true); - sink.footer(); + scaler.footer(); } void gerbolyze::SVGDocument::render_to_list(const RenderSettings &rset, vector<pair<Polygon, GerberPolarityToken>> &out, const ElementSelector *sel) { |