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

move erase operation out of scope

Browse source
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-27 15:47:33 +01:00
parent 4e56f75541
commit db290d8e8d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libslic3r/Emboss.cpp
View file

@ -117,7 +117,8 @@ void remove_spikes(ExPolygons &expolygons, const SpikeDesc &spike_desc);
bool priv::remove_when_spike(Polygon &polygon, size_t index, const SpikeDesc &spike_desc) {
std::optional<Point> add;
Points &pts = polygon.points;
bool do_erase = false;
Points &pts = polygon.points;
{
size_t pts_size = pts.size();
if (pts_size < 3)
@ -169,8 +170,7 @@ bool priv::remove_when_spike(Polygon &polygon, size_t index, const SpikeDesc &sp
if (is_ba_short && is_bc_short) {
// remove short spike
pts.erase(pts.begin() + index);
return true;
do_erase = true;
} else if (is_ba_short) {
// move point B on C-side
pts[index] = c_side();
@ -181,14 +181,18 @@ bool priv::remove_when_spike(Polygon &polygon, size_t index, const SpikeDesc &sp
// move point B on C-side and add point on A-side(left - before)
pts[index] = c_side();
add = a_side();
if (add == pts[index]) {
if (*add == pts[index]) {
// should be very rare, when SpikeDesc has small base
// will be fixed by remove B point
pts.erase(pts.begin() + index);
return true;
add.reset();
do_erase = true;
}
}
}
if (do_erase) {
pts.erase(pts.begin() + index);
return true;
}
if (add.has_value())
pts.insert(pts.begin() + index, *add);
return false;
@ -554,9 +558,9 @@ ExPolygons Emboss::heal_shape(const Polygons &shape)
#include "libslic3r/SVG.hpp"
void priv::visualize_heal(const std::string &svg_filepath, const ExPolygons &expolygons) {
double svg_scale = SHAPE_SCALE / unscale<double>(1.);
Points pts = to_points(expolygons);
BoundingBox bb(pts);
//double svg_scale = SHAPE_SCALE / unscale<double>(1.);
// bb.scale(svg_scale);
SVG svg(svg_filepath, bb);
svg.draw(expolygons);