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

Revert "Workaround for the Prusa3D Fast (layer height 0.35mm) profile, which"

Browse source 
This reverts commit ec86d94f02.
This commit is contained in:
Lukas Matena 2020-06-02 16:08:18 +02:00
parent 2cc1dffc82
commit 8ecb0bfe0e
2 changed files with 18 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/libslic3r/GCode/ToolOrdering.cpp
View file

@ -94,7 +94,7 @@ ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extrude
// Reorder the extruders to minimize tool switches. // Reorder the extruders to minimize tool switches.
this->reorder_extruders(first_extruder); this->reorder_extruders(first_extruder);
this->fill_wipe_tower_partitions(object.print()->config(), object.layers().front()->print_z - object.layers().front()->height, object.config().layer_height); this->fill_wipe_tower_partitions(object.print()->config(), object.layers().front()->print_z - object.layers().front()->height);
this->collect_extruder_statistics(prime_multi_material); this->collect_extruder_statistics(prime_multi_material);
} }
@ -107,7 +107,6 @@ ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool
// Initialize the print layers for all objects and all layers. // Initialize the print layers for all objects and all layers.
coordf_t object_bottom_z = 0.; coordf_t object_bottom_z = 0.;
coordf_t max_layer_height = 0.;
{ {
std::vector<coordf_t> zs; std::vector<coordf_t> zs;
for (auto object : print.objects()) { for (auto object : print.objects()) {
@ -123,8 +122,6 @@ ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool
object_bottom_z = layer->print_z - layer->height; object_bottom_z = layer->print_z - layer->height;
break; break;
} }
max_layer_height = std::max(max_layer_height, object->config().layer_height.value);
} }
this->initialize_layers(zs); this->initialize_layers(zs);
} }
@ -147,7 +144,7 @@ ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool
// Reorder the extruders to minimize tool switches. // Reorder the extruders to minimize tool switches.
this->reorder_extruders(first_extruder); this->reorder_extruders(first_extruder);
this->fill_wipe_tower_partitions(print.config(), object_bottom_z, max_layer_height); this->fill_wipe_tower_partitions(print.config(), object_bottom_z);
this->collect_extruder_statistics(prime_multi_material); this->collect_extruder_statistics(prime_multi_material);
} }
@ -321,7 +318,7 @@ void ToolOrdering::reorder_extruders(unsigned int last_extruder_id)
} }
} }
void ToolOrdering::fill_wipe_tower_partitions(const PrintConfig &config, coordf_t object_bottom_z, coordf_t max_object_layer_height) void ToolOrdering::fill_wipe_tower_partitions(const PrintConfig &config, coordf_t object_bottom_z)
{ {
if (m_layer_tools.empty()) if (m_layer_tools.empty())
return; return;
@ -354,10 +351,6 @@ void ToolOrdering::fill_wipe_tower_partitions(const PrintConfig &config, coordf_
mlh = 0.75 * config.nozzle_diameter.values[i]; mlh = 0.75 * config.nozzle_diameter.values[i];
max_layer_height = std::min(max_layer_height, mlh); max_layer_height = std::min(max_layer_height, mlh);
} }
// The Prusa3D Fast (0.35mm layer height) print profile sets a higher layer height than what is normally allowed
// by the nozzle. This is a hack and it works by increasing extrusion width.
max_layer_height = std::max(max_layer_height, max_object_layer_height);
for (size_t i = 0; i + 1 < m_layer_tools.size(); ++ i) { for (size_t i = 0; i + 1 < m_layer_tools.size(); ++ i) {
const LayerTools &lt = m_layer_tools[i]; const LayerTools &lt = m_layer_tools[i];
const LayerTools &lt_next = m_layer_tools[i + 1]; const LayerTools &lt_next = m_layer_tools[i + 1];
@ -400,47 +393,21 @@ void ToolOrdering::fill_wipe_tower_partitions(const PrintConfig &config, coordf_
// and maybe other problems. We will therefore go through layer_tools and detect and fix this. // and maybe other problems. We will therefore go through layer_tools and detect and fix this.
// So, if there is a non-object layer starting with different extruder than the last one ended with (or containing more than one extruder), // So, if there is a non-object layer starting with different extruder than the last one ended with (or containing more than one extruder),
// we'll mark it with has_wipe tower. // we'll mark it with has_wipe tower.
assert(! m_layer_tools.empty() && m_layer_tools.front().has_wipe_tower); for (unsigned int i=0; i+1<m_layer_tools.size(); ++i) {
if (! m_layer_tools.empty() && m_layer_tools.front().has_wipe_tower) { LayerTools& lt = m_layer_tools[i];
for (size_t i = 0; i + 1 < m_layer_tools.size();) { LayerTools& lt_next = m_layer_tools[i+1];
const LayerTools &lt = m_layer_tools[i]; if (lt.extruders.empty() || lt_next.extruders.empty())
assert(lt.has_wipe_tower); break;
assert(! lt.extruders.empty()); if (!lt_next.has_wipe_tower && (lt_next.extruders.front() != lt.extruders.back() || lt_next.extruders.size() > 1))
// Find the next layer with wipe tower or mark a layer as such. lt_next.has_wipe_tower = true;
size_t j = i + 1; // We should also check that the next wipe tower layer is no further than max_layer_height:
for (; j < m_layer_tools.size() && ! m_layer_tools[j].has_wipe_tower; ++ j) { unsigned int j = i+1;
LayerTools &lt_next = m_layer_tools[j]; double last_wipe_tower_print_z = lt_next.print_z;
if (lt_next.extruders.empty()) { while (++j < m_layer_tools.size()-1 && !m_layer_tools[j].has_wipe_tower)
//FIXME Vojtech: Lukasi, proc? if (m_layer_tools[j+1].print_z - last_wipe_tower_print_z > max_layer_height) {
j = m_layer_tools.size(); m_layer_tools[j].has_wipe_tower = true;
break; last_wipe_tower_print_z = m_layer_tools[j].print_z;
}
if (lt_next.extruders.front() != lt.extruders.back() || lt_next.extruders.size() > 1) {
// Support only layer, soluble layers? Otherwise the layer should have been already marked as having wipe tower.
assert(lt_next.has_support && ! lt_next.has_object);
lt_next.has_wipe_tower = true;
break;
}
} }
if (j == m_layer_tools.size())
// No wipe tower above layer i, therefore no need to add any wipe tower layer above i.
break;
// We should also check that the next wipe tower layer is no further than max_layer_height.
// This algorith may in theory create very thin wipe layer j if layer closely below j is marked as wipe tower.
// This may happen if printing with non-soluble break away supports.
// On the other side it should not hurt as there will be no wipe, just perimeter and sparse infill printed
// at that particular wipe tower layer without extruder change.
double last_wipe_tower_print_z = lt.print_z;
assert(m_layer_tools[j].has_wipe_tower);
for (size_t k = i + 1; k < j; ++k) {
assert(! m_layer_tools[k].has_wipe_tower);
if (m_layer_tools[k + 1].print_z - last_wipe_tower_print_z > max_layer_height + EPSILON) {
m_layer_tools[k].has_wipe_tower = true;
last_wipe_tower_print_z = m_layer_tools[k].print_z;
}
}
i = j;
}
} }
// Calculate the wipe_tower_layer_height values. // Calculate the wipe_tower_layer_height values.

2
src/libslic3r/GCode/ToolOrdering.hpp
View file

@ -168,7 +168,7 @@ private:
void initialize_layers(std::vector<coordf_t> &zs); void initialize_layers(std::vector<coordf_t> &zs);
void collect_extruders(const PrintObject &object, const std::vector<std::pair<double, unsigned int>> &per_layer_extruder_switches); void collect_extruders(const PrintObject &object, const std::vector<std::pair<double, unsigned int>> &per_layer_extruder_switches);
void reorder_extruders(unsigned int last_extruder_id); void reorder_extruders(unsigned int last_extruder_id);
void fill_wipe_tower_partitions(const PrintConfig &config, coordf_t object_bottom_z, coordf_t max_layer_height); void fill_wipe_tower_partitions(const PrintConfig &config, coordf_t object_bottom_z);
void collect_extruder_statistics(bool prime_multi_material); void collect_extruder_statistics(bool prime_multi_material);
std::vector<LayerTools> m_layer_tools; std::vector<LayerTools> m_layer_tools;