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

Change precision units to mm

Browse source 
Add some perf optimization for svg output writing
This commit is contained in:
tamasmeszaros 2022-01-13 09:59:29 +01:00
parent 5e97778528
commit ca7668d858
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ namespace {
size_t constexpr coord_t_bufsize = 40; size_t constexpr coord_t_bufsize = 40;
inline char const* decimal_from(coord_t snumber, char* buffer) char const* decimal_from(coord_t snumber, char* buffer)
{ {
std::make_unsigned_t<coord_t> number = 0; std::make_unsigned_t<coord_t> number = 0;
@ -75,17 +75,18 @@ void append_svg(std::string &buf, const Polygon &poly)
auto c = poly.points.front(); auto c = poly.points.front();
// char intbuf[coord_t_bufsize]; char intbuf[coord_t_bufsize];
buf += std::string("<path d=\"M ") + coord2str(c.x()) + " " + coord2str(c.y()) + " m"; buf += std::string("<path d=\"M ") + decimal_from(c.x(), intbuf);
buf += std::string(" ") + decimal_from(c.y(), intbuf) + " m";
for (auto &p : poly) { for (auto &p : poly) {
auto d = p - c; auto d = p - c;
if (d.squaredNorm() == 0) continue; if (d.squaredNorm() == 0) continue;
buf += " "; buf += " ";
buf += coord2str(p.x() - c.x()); buf += decimal_from(p.x() - c.x(), intbuf);
buf += " "; buf += " ";
buf += coord2str(p.y() - c.y()); buf += decimal_from(p.y() - c.y(), intbuf);
c = p; c = p;
} }
buf += " z\""; // mark path as closed buf += " z\""; // mark path as closed
@ -184,8 +185,9 @@ std::unique_ptr<sla::RasterBase> SL1_SVGArchive::create_raster() const
// auto res_x = size_t(cfg().display_pixels_x.getInt()); // auto res_x = size_t(cfg().display_pixels_x.getInt());
// auto res_y = size_t(cfg().display_pixels_y.getInt()); // auto res_y = size_t(cfg().display_pixels_y.getInt());
size_t res_x = std::round(scaled(w) / cfg().sla_output_precision.getFloat()); float precision_nm = scaled<float>(cfg().sla_output_precision.getFloat());
size_t res_y = std::round(scaled(h) / cfg().sla_output_precision.getFloat()); size_t res_x = std::round(scaled(w) / precision_nm);
size_t res_y = std::round(scaled(h) / precision_nm);
std::array<bool, 2> mirror; std::array<bool, 2> mirror;
@ -199,6 +201,7 @@ std::unique_ptr<sla::RasterBase> SL1_SVGArchive::create_raster() const
if (orientation == sla::RasterBase::roPortrait) { if (orientation == sla::RasterBase::roPortrait) {
std::swap(w, h); std::swap(w, h);
std::swap(res_x, res_y);
} }
BoundingBox svgarea{{0, 0}, {scaled(w), scaled(h)}}; BoundingBox svgarea{{0, 0}, {scaled(w), scaled(h)}};

6
src/libslic3r/PrintConfig.cpp
View file

@ -3809,10 +3809,10 @@ void PrintConfigDef::init_sla_params()
def = this->add("sla_output_precision", coFloat); def = this->add("sla_output_precision", coFloat);
def->label = L("SLA output precision"); def->label = L("SLA output precision");
def->tooltip = L("Minimum resolution in nanometers"); def->tooltip = L("Minimum resolution in nanometers");
def->sidetext = L("nm"); def->sidetext = L("mm");
def->min = 1; def->min = SCALING_FACTOR;
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionFloat(1000)); def->set_default_value(new ConfigOptionFloat(0.001));
} }
void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value) void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value)