juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/h2d-2

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
This commit is contained in:
Noisyfox
2025-09-24 09:15:33 +08:00
parent f60020da21 c59255a605
commit 580414265d
261 changed files with 9126 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/GCode/WipeTower2.cpp
View File

@@ -1350,7 +1350,7 @@ void WipeTower2::set_extruder(size_t idx, const PrintConfig& config)
// We will use the same variables internally, but the correspondence to the configuration options will be different.
float vol = config.filament_multitool_ramming_volume.get_at(idx);
float flow = config.filament_multitool_ramming_flow.get_at(idx);
m_filpar[idx].multitool_ramming = config.filament_multitool_ramming.get_at(idx);
m_filpar[idx].multitool_ramming = config.filament_multitool_ramming.get_at(idx) && vol > 0.f && flow > 0.f;
m_filpar[idx].ramming_line_width_multiplicator = 2.;
m_filpar[idx].ramming_step_multiplicator = 1.;
@@ -1360,7 +1360,7 @@ void WipeTower2::set_extruder(size_t idx, const PrintConfig& config)
// ramming_speed vector that would respect both the volume and flow (because of
// rounding issues with small volumes and high flow).
m_filpar[idx].ramming_speed.push_back(flow);
m_filpar[idx].multitool_ramming_time = vol/flow;
m_filpar[idx].multitool_ramming_time = flow > 0.f ? vol/flow : 0.f;
}
m_used_filament_length.resize(std::max(m_used_filament_length.size(), idx + 1)); // makes sure that the vector is big enough so we don't have to check later