3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix of Wipe to Infill causes severe overextrusion (thicker walls & infill) (#3842)

Browse source 
Regressinon in regard to PrusaSlicer 2.2.1 due to Vojtech's refactorings
for efficiency.
This commit is contained in:
bubnikv 2020-03-17 09:41:37 +01:00
parent df6170b9bd
commit 98fb8b626f
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/libslic3r/GCode.cpp
View file

@ -2880,11 +2880,12 @@ std::string GCode::extrude_path(ExtrusionPath path, std::string description, dou
std::string GCode::extrude_perimeters(const Print &print, const std::vector<ObjectByExtruder::Island::Region> &by_region, std::unique_ptr<EdgeGrid::Grid> &lower_layer_edge_grid) std::string GCode::extrude_perimeters(const Print &print, const std::vector<ObjectByExtruder::Island::Region> &by_region, std::unique_ptr<EdgeGrid::Grid> &lower_layer_edge_grid)
{ {
std::string gcode; std::string gcode;
for (const ObjectByExtruder::Island::Region &region : by_region) { for (const ObjectByExtruder::Island::Region &region : by_region)
m_config.apply(print.regions()[&region - &by_region.front()]->config()); if (! region.perimeters.empty()) {
for (const ExtrusionEntity *ee : region.perimeters) m_config.apply(print.regions()[&region - &by_region.front()]->config());
gcode += this->extrude_entity(*ee, "perimeter", -1., &lower_layer_edge_grid); for (const ExtrusionEntity *ee : region.perimeters)
} gcode += this->extrude_entity(*ee, "perimeter", -1., &lower_layer_edge_grid);
}
return gcode; return gcode;
} }
@ -2892,19 +2893,20 @@ std::string GCode::extrude_perimeters(const Print &print, const std::vector<Obje
std::string GCode::extrude_infill(const Print &print, const std::vector<ObjectByExtruder::Island::Region> &by_region) std::string GCode::extrude_infill(const Print &print, const std::vector<ObjectByExtruder::Island::Region> &by_region)
{ {
std::string gcode; std::string gcode;
for (const ObjectByExtruder::Island::Region &region : by_region) { for (const ObjectByExtruder::Island::Region &region : by_region)
m_config.apply(print.regions()[&region - &by_region.front()]->config()); if (! region.infills.empty()) {
ExtrusionEntitiesPtr extrusions { region.infills }; m_config.apply(print.regions()[&region - &by_region.front()]->config());
chain_and_reorder_extrusion_entities(extrusions, &m_last_pos); ExtrusionEntitiesPtr extrusions { region.infills };
for (const ExtrusionEntity *fill : extrusions) { chain_and_reorder_extrusion_entities(extrusions, &m_last_pos);
auto *eec = dynamic_cast<const ExtrusionEntityCollection*>(fill); for (const ExtrusionEntity *fill : extrusions) {
if (eec) { auto *eec = dynamic_cast<const ExtrusionEntityCollection*>(fill);
for (ExtrusionEntity *ee : eec->chained_path_from(m_last_pos).entities) if (eec) {
gcode += this->extrude_entity(*ee, "infill"); for (ExtrusionEntity *ee : eec->chained_path_from(m_last_pos).entities)
} else gcode += this->extrude_entity(*ee, "infill");
gcode += this->extrude_entity(*fill, "infill"); } else
gcode += this->extrude_entity(*fill, "infill");
}
} }
}
return gcode; return gcode;
} }
@ -3370,17 +3372,18 @@ const std::vector<GCode::ObjectByExtruder::Island::Region>& GCode::ObjectByExtru
has_overrides = true; has_overrides = true;
break; break;
} }
// Data is cleared, but the memory is not.
by_region_per_copy_cache.clear();
if (! has_overrides) if (! has_overrides)
// Simple case. No need to copy the regions. // Simple case. No need to copy the regions.
return this->by_region; return wiping_entities ? by_region_per_copy_cache : this->by_region;
// Complex case. Some of the extrusions of some object instances are to be printed first - those are the wiping extrusions. // Complex case. Some of the extrusions of some object instances are to be printed first - those are the wiping extrusions.
// Some of the extrusions of some object instances are printed later - those are the clean print extrusions. // Some of the extrusions of some object instances are printed later - those are the clean print extrusions.
// Filter out the extrusions based on the infill_overrides / perimeter_overrides: // Filter out the extrusions based on the infill_overrides / perimeter_overrides:
// Data is cleared, but the memory is not.
by_region_per_copy_cache.clear();
for (const auto& reg : by_region) { for (const auto& reg : by_region) {
by_region_per_copy_cache.emplace_back(); // creates a region in the newly created Island by_region_per_copy_cache.emplace_back(); // creates a region in the newly created Island
@ -3441,15 +3444,17 @@ void GCode::ObjectByExtruder::Island::Region::append(const Type type, const Extr
// First we append the entities, there are eec->entities.size() of them: // First we append the entities, there are eec->entities.size() of them:
size_t old_size = perimeters_or_infills->size(); size_t old_size = perimeters_or_infills->size();
perimeters_or_infills->reserve(perimeters_or_infills->size() + eec->entities.size()); size_t new_size = old_size + eec->entities.size();
perimeters_or_infills->reserve(new_size);
for (auto* ee : eec->entities) for (auto* ee : eec->entities)
perimeters_or_infills->emplace_back(ee); perimeters_or_infills->emplace_back(ee);
if (copies_extruder != nullptr) { if (copies_extruder != nullptr) {
perimeters_or_infills_overrides->reserve(old_size + eec->entities.size()); // Don't reallocate overrides if not needed.
perimeters_or_infills_overrides->resize(old_size, nullptr); // Missing overrides are implicitely considered non-overridden.
for (unsigned int i = 0; i < eec->entities.size(); ++ i) perimeters_or_infills_overrides->reserve(new_size);
perimeters_or_infills_overrides->emplace_back(copies_extruder); perimeters_or_infills_overrides->resize(old_size, nullptr);
perimeters_or_infills_overrides->resize(new_size, copies_extruder);
} }
} }