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

2 files changed, 71 insertions, 6 deletions

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) {