GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-20 13:09:06 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fix: error wipe when no finish_block_tcr

Browse Source 
jira: none

Change-Id: I0890089661a719f728c5fbc5254cf53f047d7248
This commit is contained in:
jiangkai.zhao 2025-02-07 17:25:21 +08:00 committed by lane.wei
parent fde94de17b
commit 7d48561817
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/libslic3r/GCode/WipeTower.cpp
View File

@ -851,7 +851,35 @@ public:
} while (i != index_of_closest); } while (i != index_of_closest);
return (*this); return (*this);
} }
WipeTowerWriter &line(const WipeTower *wipe_tower, Vec2f p0, Vec2f p1,const float f = 0.f)
{
bool need_change_flow = wipe_tower->need_thick_bridge_flow(p0.y());
if (need_change_flow) set_extrusion_flow(wipe_tower->extrusion_flow(0.2));
if (abs(x() - p0.x()) > abs(x() - p1.x())) std::swap(p0, p1);
travel(p0.x(), y());
travel(x(), p0.y());
extrude(p1, f);
set_extrusion_flow(wipe_tower->get_extrusion_flow());
return (*this);
}
WipeTowerWriter &rectangle_fill_box(const WipeTower *wipe_tower, const WipeTower::box_coordinates &fill_box, std::vector<Vec2f> &finish_rect_wipe_path, const float f = 0.f)
{
float width = fill_box.rd.x() - fill_box.ld.x();
float height = fill_box.ru.y() - fill_box.rd.y();
if (height > wipe_tower->m_perimeter_width - wipe_tower->WT_EPSILON) {
rectangle_fill_box(wipe_tower, fill_box.ld, width, height, f);
Vec2f target = (pos() == fill_box.ld ? fill_box.rd : (pos() == fill_box.rd ? fill_box.ru : (pos() == fill_box.ru ? fill_box.lu : fill_box.ld)));
finish_rect_wipe_path.emplace_back(pos());
finish_rect_wipe_path.emplace_back(target);
} else if (height > wipe_tower->WT_EPSILON) {
line(wipe_tower, fill_box.ld, fill_box.rd);
Vec2f target = (pos() == fill_box.ld ? fill_box.rd : fill_box.ld);
finish_rect_wipe_path.emplace_back(pos());
finish_rect_wipe_path.emplace_back(target);
}
return (*this);
}
WipeTowerWriter& rectangle(const WipeTower::box_coordinates& box, const float f = 0.f) WipeTowerWriter& rectangle(const WipeTower::box_coordinates& box, const float f = 0.f)
{ {
rectangle(Vec2f(box.ld.x(), box.ld.y()), rectangle(Vec2f(box.ld.x(), box.ld.y()),
@ -2859,14 +2887,8 @@ WipeTower::ToolChangeResult WipeTower::finish_layer_new(bool extrude_perimeter,
std::vector<Vec2f> finish_rect_wipe_path; std::vector<Vec2f> finish_rect_wipe_path;
if (extrude_fill_wall) { if (extrude_fill_wall) {
// inner perimeter of the sparse section, if there is space for it: // inner perimeter of the sparse section, if there is space for it:
if (fill_box.ru.y() - fill_box.rd.y() > m_perimeter_width - WT_EPSILON) { if (fill_box.ru.y() - fill_box.rd.y() > WT_EPSILON) {
writer.rectangle_fill_box(this, fill_box.ld, fill_box.rd.x() - fill_box.ld.x(), fill_box.ru.y() - fill_box.rd.y(), feedrate); writer.rectangle_fill_box(this, fill_box, finish_rect_wipe_path, feedrate);
Vec2f target = (writer.pos() == fill_box.ld ? fill_box.rd :
(writer.pos() == fill_box.rd ? fill_box.ru :
(writer.pos() == fill_box.ru ? fill_box.lu :
fill_box.ld)));
finish_rect_wipe_path.emplace_back(writer.pos());
finish_rect_wipe_path.emplace_back(target);
} }
} }
@ -3034,13 +3056,8 @@ WipeTower::ToolChangeResult WipeTower::finish_block(const WipeTowerBlock &block,
std::vector<Vec2f> finish_rect_wipe_path; std::vector<Vec2f> finish_rect_wipe_path;
// inner perimeter of the sparse section, if there is space for it: // inner perimeter of the sparse section, if there is space for it:
if (fill_box.ru.y() - fill_box.rd.y() > m_perimeter_width - WT_EPSILON) { if (fill_box.ru.y() - fill_box.rd.y() > WT_EPSILON) {
writer.rectangle_fill_box(this, fill_box.ld, fill_box.rd.x() - fill_box.ld.x(), fill_box.ru.y() - fill_box.rd.y(), feedrate); writer.rectangle_fill_box(this, fill_box, finish_rect_wipe_path, feedrate);
Vec2f target = (writer.pos() == fill_box.ld ? fill_box.rd :
(writer.pos() == fill_box.rd ? fill_box.ru :
(writer.pos() == fill_box.ru ? fill_box.lu : fill_box.ld)));
finish_rect_wipe_path.emplace_back(writer.pos());
finish_rect_wipe_path.emplace_back(target);
} }
// Extrude infill to support the material to be printed above. // Extrude infill to support the material to be printed above.
@ -3748,7 +3765,7 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
} }
for (WipeTowerBlock& block : m_wipe_tower_blocks) { for (WipeTowerBlock& block : m_wipe_tower_blocks) {
if (block.cur_depth + EPSILON >= block.start_depth + block.layer_depths[m_cur_layer_id]) { if (block.cur_depth + EPSILON >= block.start_depth + block.layer_depths[m_cur_layer_id]-m_perimeter_width) {
continue; continue;
} }

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

@ -21,6 +21,7 @@ enum GCodeFlavor : unsigned char;
class WipeTower class WipeTower
{ {
public: public:
friend class WipeTowerWriter;
static const std::string never_skip_tag() { return "_GCODE_WIPE_TOWER_NEVER_SKIP_TAG"; } static const std::string never_skip_tag() { return "_GCODE_WIPE_TOWER_NEVER_SKIP_TAG"; }
// WipeTower height to minimum depth map // WipeTower height to minimum depth map