GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-15 10:56:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix first layer tool ordering in print-by-object mode (#6664)

Browse Source 
Fix first layer tool ordering in print-by-object mode (SoftFever/OrcaSlicer#6615)
This commit is contained in:
Noisyfox 2025-01-22 10:05:38 +08:00 committed by GitHub
parent 74cf736903
commit 880081226a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/libslic3r/GCode/ToolOrdering.cpp
View File

@ -206,6 +206,7 @@ static double calc_max_layer_height(const PrintConfig &config, double max_object
ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extruder, bool prime_multi_material) ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extruder, bool prime_multi_material)
{ {
m_is_BBL_printer = object.print()->is_BBL_printer(); m_is_BBL_printer = object.print()->is_BBL_printer();
m_print_full_config = &object.print()->full_print_config();
m_print_object_ptr = &object; m_print_object_ptr = &object;
if (object.layers().empty()) if (object.layers().empty())
return; return;
@ -250,6 +251,7 @@ ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extrude
ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool prime_multi_material) ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool prime_multi_material)
{ {
m_is_BBL_printer = print.is_BBL_printer(); m_is_BBL_printer = print.is_BBL_printer();
m_print_full_config = &print.full_print_config();
m_print_config_ptr = &print.config(); m_print_config_ptr = &print.config();
// Initialize the print layers for all objects and all layers. // Initialize the print layers for all objects and all layers.
@ -315,6 +317,24 @@ ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool
this->mark_skirt_layers(print.config(), max_layer_height); this->mark_skirt_layers(print.config(), max_layer_height);
} }
static void apply_first_layer_order(const DynamicPrintConfig* config, std::vector<unsigned int>& tool_order) {
const ConfigOptionInts* first_layer_print_sequence_op = config->option<ConfigOptionInts>("first_layer_print_sequence");
if (first_layer_print_sequence_op) {
const std::vector<int>& print_sequence_1st = first_layer_print_sequence_op->values;
if (print_sequence_1st.size() >= tool_order.size()) {
std::sort(tool_order.begin(), tool_order.end(), [&print_sequence_1st](int lh, int rh) {
auto lh_it = std::find(print_sequence_1st.begin(), print_sequence_1st.end(), lh);
auto rh_it = std::find(print_sequence_1st.begin(), print_sequence_1st.end(), rh);
if (lh_it == print_sequence_1st.end() || rh_it == print_sequence_1st.end())
return false;
return lh_it < rh_it;
});
}
}
}
// BBS // BBS
std::vector<unsigned int> ToolOrdering::generate_first_layer_tool_order(const Print& print) std::vector<unsigned int> ToolOrdering::generate_first_layer_tool_order(const Print& print)
{ {
@ -359,21 +379,7 @@ std::vector<unsigned int> ToolOrdering::generate_first_layer_tool_order(const Pr
tool_order.insert(iter, ape.first); tool_order.insert(iter, ape.first);
} }
const ConfigOptionInts* first_layer_print_sequence_op = print.full_print_config().option<ConfigOptionInts>("first_layer_print_sequence"); apply_first_layer_order(m_print_full_config, tool_order);
if (first_layer_print_sequence_op) {
const std::vector<int>& print_sequence_1st = first_layer_print_sequence_op->values;
if (print_sequence_1st.size() >= tool_order.size()) {
std::sort(tool_order.begin(), tool_order.end(), [&print_sequence_1st](int lh, int rh) {
auto lh_it = std::find(print_sequence_1st.begin(), print_sequence_1st.end(), lh);
auto rh_it = std::find(print_sequence_1st.begin(), print_sequence_1st.end(), rh);
if (lh_it == print_sequence_1st.end() || rh_it == print_sequence_1st.end())
return false;
return lh_it < rh_it;
});
}
}
return tool_order; return tool_order;
} }
@ -417,21 +423,7 @@ std::vector<unsigned int> ToolOrdering::generate_first_layer_tool_order(const Pr
tool_order.insert(iter, ape.first); tool_order.insert(iter, ape.first);
} }
const ConfigOptionInts* first_layer_print_sequence_op = object.print()->full_print_config().option<ConfigOptionInts>("first_layer_print_sequence"); apply_first_layer_order(m_print_full_config, tool_order);
if (first_layer_print_sequence_op) {
const std::vector<int>& print_sequence_1st = first_layer_print_sequence_op->values;
if (print_sequence_1st.size() >= tool_order.size()) {
std::sort(tool_order.begin(), tool_order.end(), [&print_sequence_1st](int lh, int rh) {
auto lh_it = std::find(print_sequence_1st.begin(), print_sequence_1st.end(), lh);
auto rh_it = std::find(print_sequence_1st.begin(), print_sequence_1st.end(), rh);
if (lh_it == print_sequence_1st.end() || rh_it == print_sequence_1st.end())
return false;
return lh_it < rh_it;
});
}
}
return tool_order; return tool_order;
} }
@ -606,14 +598,19 @@ void ToolOrdering::reorder_extruders(unsigned int last_extruder_id)
break; break;
} }
// On first layer with wipe tower, prefer a soluble extruder if (lt == m_layer_tools[0]) {
// at the beginning, so it is not wiped on the first layer. // On first layer with wipe tower, prefer a soluble extruder
if (lt == m_layer_tools[0] && m_print_config_ptr && m_print_config_ptr->enable_prime_tower) { // at the beginning, so it is not wiped on the first layer.
for (size_t i = 0; i<lt.extruders.size(); ++i) if (m_print_config_ptr && m_print_config_ptr->enable_prime_tower) {
if (m_print_config_ptr->filament_soluble.get_at(lt.extruders[i]-1)) { // 1-based... for (size_t i = 0; i<lt.extruders.size(); ++i)
std::swap(lt.extruders[i], lt.extruders.front()); if (m_print_config_ptr->filament_soluble.get_at(lt.extruders[i]-1)) { // 1-based...
break; std::swap(lt.extruders[i], lt.extruders.front());
} break;
}
}
// Then, if we specified the tool order, apply it now
apply_first_layer_order(m_print_full_config, lt.extruders);
} }
} }
last_extruder_id = lt.extruders.back(); last_extruder_id = lt.extruders.back();

1
src/libslic3r/GCode/ToolOrdering.hpp
View File

@ -210,6 +210,7 @@ private:
// All extruders, which extrude some material over m_layer_tools. // All extruders, which extrude some material over m_layer_tools.
std::vector<unsigned int> m_all_printing_extruders; std::vector<unsigned int> m_all_printing_extruders;
std::unordered_map<uint32_t, std::vector<uint8_t>> m_tool_order_cache; std::unordered_map<uint32_t, std::vector<uint8_t>> m_tool_order_cache;
const DynamicPrintConfig* m_print_full_config = nullptr;
const PrintConfig* m_print_config_ptr = nullptr; const PrintConfig* m_print_config_ptr = nullptr;
const PrintObject* m_print_object_ptr = nullptr; const PrintObject* m_print_object_ptr = nullptr;
bool m_is_BBL_printer = false; bool m_is_BBL_printer = false;