mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-06 22:47:32 -06:00
Fixed an bug that filament_minimal_purge_on_wipe_tower option doesn't work for soluable filament (#8397)
This commit is contained in:
parent
b4a7721cc0
commit
fcc5489911
1 changed files with 14 additions and 10 deletions
|
@ -1601,20 +1601,24 @@ void WipeTower2::save_on_last_wipe()
|
||||||
auto& toolchange = m_layer_info->tool_changes[i];
|
auto& toolchange = m_layer_info->tool_changes[i];
|
||||||
tool_change(toolchange.new_tool);
|
tool_change(toolchange.new_tool);
|
||||||
|
|
||||||
if (i == idx) {
|
// Orca: allow calculation of the required depth and wipe volume for soluable toolchanges as well
|
||||||
float width = m_wipe_tower_width - 3*m_perimeter_width; // width we draw into
|
// NOTE: it's not clear if this is the right way, technically we should disable wipe tower if soluble filament is used as it
|
||||||
|
// will will make the wipe tower unstable. Need to revist this in the future.
|
||||||
|
|
||||||
float volume_to_save = length_to_volume(finish_layer().total_extrusion_length_in_plane(), m_perimeter_width, m_layer_info->height);
|
// if (i == idx) {
|
||||||
float volume_left_to_wipe = std::max(m_filpar[toolchange.new_tool].filament_minimal_purge_on_wipe_tower, toolchange.wipe_volume_total - volume_to_save);
|
float width = m_wipe_tower_width - 3*m_perimeter_width; // width we draw into
|
||||||
float volume_we_need_depth_for = std::max(0.f, volume_left_to_wipe - length_to_volume(toolchange.first_wipe_line, m_perimeter_width*m_extra_flow, m_layer_info->height));
|
|
||||||
float depth_to_wipe = get_wipe_depth(volume_we_need_depth_for, m_layer_info->height, m_perimeter_width, m_extra_flow, m_extra_spacing_wipe, width);
|
|
||||||
|
|
||||||
toolchange.required_depth = toolchange.ramming_depth + depth_to_wipe;
|
float volume_to_save = length_to_volume(finish_layer().total_extrusion_length_in_plane(), m_perimeter_width, m_layer_info->height);
|
||||||
toolchange.wipe_volume = volume_left_to_wipe;
|
float volume_left_to_wipe = std::max(m_filpar[toolchange.new_tool].filament_minimal_purge_on_wipe_tower, toolchange.wipe_volume_total - volume_to_save);
|
||||||
}
|
float volume_we_need_depth_for = std::max(0.f, volume_left_to_wipe - length_to_volume(toolchange.first_wipe_line, m_perimeter_width*m_extra_flow, m_layer_info->height));
|
||||||
}
|
float depth_to_wipe = get_wipe_depth(volume_we_need_depth_for, m_layer_info->height, m_perimeter_width, m_extra_flow, m_extra_spacing_wipe, width);
|
||||||
|
|
||||||
|
toolchange.required_depth = toolchange.ramming_depth + depth_to_wipe;
|
||||||
|
toolchange.wipe_volume = volume_left_to_wipe;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Return index of first toolchange that switches to non-soluble extruder
|
// Return index of first toolchange that switches to non-soluble extruder
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue