1 files changed, 20 insertions, 10 deletions

diff --git a/xs/src/libslic3r/SVG.hpp b/xs/src/libslic3r/SVG.hpp
index aa08c0e20..5388b1b03 100644
--- a/xs/src/libslic3r/SVG.hpp
+++ b/xs/src/libslic3r/SVG.hpp
@@ -2,6 +2,7 @@
 #define slic3r_SVG_hpp_
 
 #include "libslic3r.h"
+#include "clipper.hpp"
 #include "ExPolygon.hpp"
 #include "Line.hpp"
 #include "TriangleMesh.hpp"
@@ -14,34 +15,43 @@ class SVG
     bool arrows;
     std::string fill, stroke;
     Point origin;
+    bool flipY;
 
     SVG(const char* filename);
-    SVG(const char* filename, const BoundingBox &bbox);
+    SVG(const char* filename, const BoundingBox &bbox, const coord_t bbox_offset = scale_(1.), bool flipY = false);
     ~SVG() { if (f != NULL) Close(); }
 
-    void draw(const Line &line, std::string stroke = "black", coord_t stroke_width = 0);
-    void draw(const ThickLine &line, const std::string &fill, const std::string &stroke, coord_t stroke_width = 0);
-    void draw(const Lines &lines, std::string stroke = "black");
+    void draw(const Line &line, std::string stroke = "black", coordf_t stroke_width = 0);
+    void draw(const ThickLine &line, const std::string &fill, const std::string &stroke, coordf_t stroke_width = 0);
+    void draw(const Lines &lines, std::string stroke = "black", coordf_t stroke_width = 0);
     void draw(const IntersectionLines &lines, std::string stroke = "black");
     void draw(const ExPolygon &expolygon, std::string fill = "grey");
     void draw(const ExPolygons &expolygons, std::string fill = "grey");
     void draw(const Polygon &polygon, std::string fill = "grey");
+    void draw_outline(const Polygon &polygon, std::string stroke = "black", coordf_t stroke_width = 0);
     void draw(const Polygons &polygons, std::string fill = "grey");
-    void draw(const Polyline &polyline, std::string stroke = "black", coord_t stroke_width = 0);
-    void draw(const Polylines &polylines, std::string stroke = "black", coord_t stroke_width = 0);
-    void draw(const ThickLines &thicklines, const std::string &fill = "lime", const std::string &stroke = "black", coord_t stroke_width = 0);
-    void draw(const ThickPolylines &polylines, const std::string &stroke = "black", coord_t stroke_width = 0);
-    void draw(const ThickPolylines &thickpolylines, const std::string &fill, const std::string &stroke, coord_t stroke_width);
+    void draw_outline(const Polygons &polygons, std::string stroke = "black", coordf_t stroke_width = 0);
+    void draw(const Polyline &polyline, std::string stroke = "black", coordf_t stroke_width = 0);
+    void draw(const Polylines &polylines, std::string stroke = "black", coordf_t stroke_width = 0);
+    void draw(const ThickLines &thicklines, const std::string &fill = "lime", const std::string &stroke = "black", coordf_t stroke_width = 0);
+    void draw(const ThickPolylines &polylines, const std::string &stroke = "black", coordf_t stroke_width = 0);
+    void draw(const ThickPolylines &thickpolylines, const std::string &fill, const std::string &stroke, coordf_t stroke_width);
     void draw(const Point &point, std::string fill = "black", coord_t radius = 0);
     void draw(const Points &points, std::string fill = "black", coord_t radius = 0);
+
+    // Support for rendering the ClipperLib paths
+    void draw(const ClipperLib::Path  &polygon, double scale, std::string fill = "grey", coordf_t stroke_width = 0);
+    void draw(const ClipperLib::Paths &polygons, double scale, std::string fill = "grey", coordf_t stroke_width = 0);
+
     void Close();
     
     private:
     std::string filename;
     FILE* f;
     
-    void path(const std::string &d, bool fill, coord_t stroke_width = 0);
+    void path(const std::string &d, bool fill, coordf_t stroke_width);
     std::string get_path_d(const MultiPoint &mp, bool closed = false) const;
+    std::string get_path_d(const ClipperLib::Path &mp, double scale, bool closed = false) const;
 };
 
 }