mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: alternate multi-head printing sequence 

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I739438e8c411b638571d5291f3e5ad3d54650a73
This commit is contained in:
xun.zhang 2024-07-10 18:40:52 +08:00 committed by lane.wei
parent f1b0805ed1
commit 1ab2964ee3
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,12 +145,9 @@ int reorder_filaments_for_minimum_flush_volume(const std::vector<unsigned int>&f
{ {
int cost = 0; int cost = 0;
if (filament_sequences) { //TODO: handle case with custom sequence
filament_sequences->clear();
filament_sequences->resize(layer_filaments.size());
}
std::vector<std::set<int>>groups(2); std::vector<std::set<int>>groups(2);
std::vector<std::vector<std::vector<unsigned>>> layer_sequences(2);
for (int i = 0; i < filament_maps.size(); ++i) { for (int i = 0; i < filament_maps.size(); ++i) {
if (filament_maps[i] == 0) if (filament_maps[i] == 0)
groups[0].insert(filament_lists[i]); groups[0].insert(filament_lists[i]);
@ -175,7 +172,7 @@ int reorder_filaments_for_minimum_flush_volume(const std::vector<unsigned int>&f
} }
assert(lf.size() == unsign_custom_extruder_seq.size()); assert(lf.size() == unsign_custom_extruder_seq.size());
if (filament_sequences) if (filament_sequences)
(*filament_sequences)[layer] = unsign_custom_extruder_seq; layer_sequences[idx].emplace_back(unsign_custom_extruder_seq);
current_extruder_id = unsign_custom_extruder_seq.back(); current_extruder_id = unsign_custom_extruder_seq.back();
continue; continue;
@ -192,7 +189,7 @@ int reorder_filaments_for_minimum_flush_volume(const std::vector<unsigned int>&f
assert(sequence.size()==filament_used_in_group.size()); assert(sequence.size()==filament_used_in_group.size());
if (filament_sequences) if (filament_sequences)
(*filament_sequences)[layer].insert((*filament_sequences)[layer].end(), sequence.begin(), sequence.end()); layer_sequences[idx].emplace_back(sequence);
if (!sequence.empty()) if (!sequence.empty())
current_extruder_id = sequence.back(); current_extruder_id = sequence.back();
@ -201,6 +198,22 @@ int reorder_filaments_for_minimum_flush_volume(const std::vector<unsigned int>&f
} }
} }
if (filament_sequences) {
filament_sequences->clear();
filament_sequences->resize(layer_filaments.size());
for (size_t layer = 0; layer < layer_filaments.size(); ++layer) {
auto& curr_layer_seq = (*filament_sequences)[layer];
if (layer & 1) {
curr_layer_seq.insert(curr_layer_seq.end(), layer_sequences[1][layer].begin(), layer_sequences[1][layer].end());
curr_layer_seq.insert(curr_layer_seq.end(), layer_sequences[0][layer].begin(), layer_sequences[0][layer].end());
}
else {
curr_layer_seq.insert(curr_layer_seq.end(), layer_sequences[0][layer].begin(), layer_sequences[0][layer].end());
curr_layer_seq.insert(curr_layer_seq.end(), layer_sequences[1][layer].begin(), layer_sequences[1][layer].end());
}
}
}
return cost; return cost;
} }

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

@ -9,8 +9,8 @@
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
#include "../FilamentGroup.hpp" #include "../FilamentGroup.hpp"
#include "ExtrusionEntity.hpp" #include "../ExtrusionEntity.hpp"
#include "PrintConfig.hpp" #include "../PrintConfig.hpp"
namespace Slic3r { namespace Slic3r {