3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Export scaled integer coordinates into svg

Browse source 
This is faster and lossless
This commit is contained in:
tamasmeszaros 2022-01-07 13:18:40 +01:00
parent 00764ceade
commit b45c6ef173
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libslic3r/Format/SL1_SVG.cpp
View file

@ -32,9 +32,9 @@ void append_svg(std::string &buf, const Polygon &poly)
buf += "<path d=\"M"; buf += "<path d=\"M";
for (auto &p : poly) { for (auto &p : poly) {
buf += " "; buf += " ";
buf += float_to_string_decimal_point(unscaled<float>(p.x())); buf += std::to_string(p.x());
buf += " "; buf += " ";
buf += float_to_string_decimal_point(unscaled<float>(p.y())); buf += std::to_string(p.y());
} }
buf += " z\""; // mark path as closed buf += " z\""; // mark path as closed
buf += " />\n"; buf += " />\n";
@ -55,13 +55,24 @@ public:
: m_bb{BoundingBox{{0, 0}, Vec2crd{res.width_px, res.height_px}}} : m_bb{BoundingBox{{0, 0}, Vec2crd{res.width_px, res.height_px}}}
, m_trafo{tr} , m_trafo{tr}
{ {
std::string w = float_to_string_decimal_point(unscaled<float>(res.width_px)); // Inside the svg header, the boundaries will be defined in mm to
std::string h = float_to_string_decimal_point(unscaled<float>(res.height_px)); // the actual bed size. The viewport is then defined to work with our
// scaled coordinates. All the exported polygons will be in these scaled
// coordinates but svg rendering software will interpret them correctly
// in mm due to the header's definition.
std::string wf = float_to_string_decimal_point(unscaled<float>(res.width_px));
std::string hf = float_to_string_decimal_point(unscaled<float>(res.height_px));
std::string w = std::to_string(res.width_px);
std::string h = std::to_string(res.height_px);
// Notice the header also defines the fill-rule as nonzero which should
// generate correct results for our ExPolygons.
// Add svg header. // Add svg header.
m_svg = m_svg =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.0//EN\" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n" "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.0//EN\" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n"
"<svg height=\"" + h + "mm" + "\" width=\"" + w + "mm" + "\" viewBox=\"0 0 " + w + " " + h + "<svg height=\"" + hf + "mm" + "\" width=\"" + wf + "mm" + "\" viewBox=\"0 0 " + w + " " + h +
"\" style=\"fill: white; stroke: none; fill-rule: nonzero\" " "\" style=\"fill: white; stroke: none; fill-rule: nonzero\" "
"xmlns=\"http://www.w3.org/2000/svg\" xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n"; "xmlns=\"http://www.w3.org/2000/svg\" xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n";
@ -128,7 +139,7 @@ std::unique_ptr<sla::RasterBase> SL1_SVGArchive::create_raster() const
// Gamma does not really make sense in an svg, right? // Gamma does not really make sense in an svg, right?
// double gamma = cfg().gamma_correction.getFloat(); // double gamma = cfg().gamma_correction.getFloat();
return std::make_unique<SVGRaster>(SVGRaster::Resolution{w, h}, tr); return std::make_unique<SVGRaster>(res, tr);
} }
sla::RasterEncoder SL1_SVGArchive::get_encoder() const sla::RasterEncoder SL1_SVGArchive::get_encoder() const