svg-flatten: Fix case where document unit is not mm

5 files changed, 133 insertions, 6 deletions

diff --git a/svg-flatten/Makefile b/svg-flatten/Makefile
index 6822f47..fc5820f 100644
--- a/svg-flatten/Makefile
+++ b/svg-flatten/Makefile
@@ -24,6 +24,7 @@ SOURCES := src/svg_color.cpp \
 	src/out_sexp.cpp \
 	src/out_flattener.cpp \
 	src/out_dilater.cpp \
+	src/out_scaler.cpp \
 	src/lambda_sink.cpp \
 	src/flatten.cpp \
 	src/util.cpp \
diff --git a/svg-flatten/include/gerbolyze.hpp b/svg-flatten/include/gerbolyze.hpp
index 9b05bdb..7b70501 100644
--- a/svg-flatten/include/gerbolyze.hpp
+++ b/svg-flatten/include/gerbolyze.hpp
@@ -110,6 +110,20 @@ namespace gerbolyze {
             GerberPolarityToken m_current_polarity = GRB_POL_DARK;
     };
 
+    class Scaler : public PolygonSink {
+        public:
+            Scaler(PolygonSink &sink, double scale=1.0) : m_sink(sink), m_scale(scale) {}
+            virtual void header(d2p origin, d2p size);
+            virtual Scaler &operator<<(const Polygon &poly);
+            virtual Scaler &operator<<(const LayerNameToken &layer_name);
+            virtual Scaler &operator<<(GerberPolarityToken pol);
+            virtual void footer();
+
+        private:
+            PolygonSink &m_sink;
+            double m_scale;
+    };
+
     class StreamPolygonSink : public PolygonSink {
     public:
         StreamPolygonSink(std::ostream &out, bool only_polys=false) : m_only_polys(only_polys), m_out(out) {}
diff --git a/svg-flatten/src/out_scaler.cpp b/svg-flatten/src/out_scaler.cpp
new file mode 100644
index 0000000..983dffe
--- /dev/null
+++ b/svg-flatten/src/out_scaler.cpp
@@ -0,0 +1,61 @@
+/*
+ * This file is part of gerbolyze, a vector image preprocessing toolchain 
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <cmath>
+#include <algorithm>
+#include <string>
+#include <iostream>
+#include <iomanip>
+#include <gerbolyze.hpp>
+#include <clipper.hpp>
+#include <svg_import_defs.h>
+#include <svg_geom.h>
+
+using namespace gerbolyze;
+using namespace std;
+
+void Scaler::header(d2p origin, d2p size) {
+    m_sink.header({origin[0] * m_scale, origin[1] * m_scale}, {size[0] * m_scale, size[1] * m_scale});
+}
+
+void Scaler::footer() {
+    m_sink.footer();
+}
+
+Scaler &Scaler::operator<<(const LayerNameToken &layer_name) {
+    m_sink << layer_name;
+
+    return *this;
+}
+
+Scaler &Scaler::operator<<(GerberPolarityToken pol) {
+    m_sink << pol;
+
+    return *this;
+}
+
+Scaler &Scaler::operator<<(const Polygon &poly) {
+    Polygon new_poly;
+    for (auto &p : poly) {
+        new_poly.push_back({ p[0] * m_scale, p[1] * m_scale });
+    }
+    m_sink << new_poly;
+
+    return *this;
+}
+
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) {
diff --git a/svg-flatten/testdata/svg/doc_unit_scale.svg b/svg-flatten/testdata/svg/doc_unit_scale.svg
new file mode 100644
index 0000000..cba6aec
--- /dev/null
+++ b/svg-flatten/testdata/svg/doc_unit_scale.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="53.39mm"
+   height="32.4mm"
+   viewBox="0 0 151.34 91.83"
+   version="1.1"
+   id="svg1394"
+   sodipodi:docname="doc_unit_scale.svg"
+   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1396"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="2.8708564"
+     inkscape:cx="127.66225"
+     inkscape:cy="78.54799"
+     inkscape:window-width="1920"
+     inkscape:window-height="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1394" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#231f20;}</style>
+  </defs>
+  <rect
+     style="fill:#000000;stroke:none;stroke-width:1.9825;stroke-linecap:round;stroke-linejoin:bevel;stop-color:#000000"
+     id="rect2359"
+     width="99.211464"
+     height="42.519199"
+     x="28.346132"
+     y="14.16733"
+     rx="0"
+     ry="0" />
+</svg>