FIX:Change the sorting method of the wall filament

and fix wipe_tower's interface bug
jira: none

Change-Id: I3887142bac2d43a4d2b6db65b5a3976bb271cf71
This commit is contained in:
jiangkai.zhao 2025-02-14 17:39:56 +08:00 committed by lane.wei
parent 3e0b6eb228
commit 58891ce310
1 changed files with 4 additions and 4 deletions

View File

@ -3661,8 +3661,8 @@ void WipeTower::plan_tower_new()
int WipeTower::get_wall_filament_for_all_layer()
{
std::unordered_map<int, int> category_counts;
std::unordered_map<int, int> filament_counts;
std::map<int, int> category_counts;
std::map<int, int> filament_counts;
for (const auto &layer : m_plan) {
for (size_t i = 0; i < layer.tool_changes.size(); ++i) {
if (i == 0) {
@ -3845,8 +3845,8 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
ToolChangeResult finish_block_tcr;
if (interface_solid || block.solid_infill_lower_h_nozzlechange[m_cur_layer_id] ||
(block.solid_infill[m_cur_layer_id] && block.filament_adhesiveness_category != m_filament_categories[finish_layer_filament])) {
interface_solid = block.filament_adhesiveness_category == m_filament_categories[finish_layer_filament]; // reduce speed
(block.solid_infill[m_cur_layer_id] && block.filament_adhesiveness_category != m_filament_categories[wall_idx])) {
interface_solid = interface_solid && !((block.solid_infill[m_cur_layer_id] && block.filament_adhesiveness_category != m_filament_categories[wall_idx]));//noly reduce speed when
finish_block_tcr = finish_block_solid(block, finish_layer_filament, layer.extruder_fill, interface_solid);
}
else {