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

Reduction is now correctly calculated for each region, soluble filament excluded from infill wiping

Browse source
This commit is contained in:
Lukas Matena 2018-05-28 15:33:19 +02:00
parent bfe4350a89
commit c72ecb382d
2 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
xs/src/libslic3r/GCode.cpp
View file

@ -1338,31 +1338,37 @@ void GCode::process_layer(
m_avoid_crossing_perimeters.disable_once = true;
}
gcode += "; INFILL WIPING STARTS\n";
if (extruder_id != layer_tools.extruders.front()) { // if this is the first extruder on this layer, there was no toolchange
for (const auto& layer_to_print : layers) { // iterate through all objects
if (layer_to_print.object_layer == nullptr)
continue;
std::vector<ObjectByExtruder::Island::Region> overridden;
for (size_t region_id = 0; region_id < print.regions.size(); ++ region_id) {
ObjectByExtruder::Island::Region new_region;
overridden.push_back(new_region);
for (ExtrusionEntity *ee : (*layer_to_print.object_layer).regions[region_id]->fills.entities) {
auto *fill = dynamic_cast<ExtrusionEntityCollection*>(ee);
if (fill->get_extruder_override() == extruder_id) {
overridden.back().infills.append(*fill);
fill->set_extruder_override(-1);
}
}
if (print.config.wipe_into_infill.value) {
gcode += "; INFILL WIPING STARTS\n";
if (extruder_id != layer_tools.extruders.front()) { // if this is the first extruder on this layer, there was no toolchange
for (const auto& layer_to_print : layers) { // iterate through all objects
gcode+="objekt\n";
if (layer_to_print.object_layer == nullptr)
continue;
std::vector<ObjectByExtruder::Island::Region> overridden;
for (size_t region_id = 0; region_id < print.regions.size(); ++ region_id) {
gcode+="region\n";
ObjectByExtruder::Island::Region new_region;
overridden.push_back(new_region);
for (ExtrusionEntity *ee : (*layer_to_print.object_layer).regions[region_id]->fills.entities) {
gcode+="entity\n";
auto *fill = dynamic_cast<ExtrusionEntityCollection*>(ee);
if (fill->get_extruder_override() == extruder_id) {
gcode+="*\n";
overridden.back().infills.append(*fill);
fill->set_extruder_override(-1);
}
}
}
m_config.apply((layer_to_print.object_layer)->object()->config, true);
Point copy = (layer_to_print.object_layer)->object()->_shifted_copies.front();
this->set_origin(unscale(copy.x), unscale(copy.y));
gcode += this->extrude_infill(print, overridden);
}
}
gcode += "; WIPING FINISHED\n";
}
gcode += "; WIPING FINISHED\n";
auto objects_by_extruder_it = by_extruder.find(extruder_id);