GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-02 06:30:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-2437: Avoid unnecessary emitting of the Z axis by the pressure equalizer when it doesn't change and isn't provided.

Browse Source
This commit is contained in:
Lukáš Hejl 2024-08-28 09:52:05 +02:00 committed by Lukas Matena
parent e8b1d0ad75
commit c41e0c22ce
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libslic3r/GCode/PressureEqualizer.cpp
View File

@ -480,7 +480,7 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
return true; return true;
} }
void PressureEqualizer::GCodeLine::update_end_position(const float *position_end) void PressureEqualizer::GCodeLine::update_end_position(const float *position_end, const bool *position_provided_original)
{ {
assert(position_end != nullptr); assert(position_end != nullptr);
if (position_end == nullptr) if (position_end == nullptr)
@ -488,11 +488,11 @@ void PressureEqualizer::GCodeLine::update_end_position(const float *position_end
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
this->pos_end[i] = position_end[i]; this->pos_end[i] = position_end[i];
this->pos_provided[i] = true; this->pos_provided[i] = position_provided_original[i] || (this->pos_end[i] != this->pos_start[i]);
} }
} }
void PressureEqualizer::GCodeLine::update_end_position(const float *position_start, const float *position_end, const float t) void PressureEqualizer::GCodeLine::update_end_position(const float *position_start, const float *position_end, const float t, const bool *position_provided_original)
{ {
assert(position_start != nullptr && position_end != nullptr); assert(position_start != nullptr && position_end != nullptr);
if (position_start == nullptr || position_end == nullptr) if (position_start == nullptr || position_end == nullptr)
@ -500,7 +500,7 @@ void PressureEqualizer::GCodeLine::update_end_position(const float *position_sta
for (size_t i = 0; i < 4; ++i) { for (size_t i = 0; i < 4; ++i) {
this->pos_end[i] = position_start[i] + (position_end[i] - position_start[i]) * t; this->pos_end[i] = position_start[i] + (position_end[i] - position_start[i]) * t;
this->pos_provided[i] = true; this->pos_provided[i] = position_provided_original[i] || (this->pos_end[i] != this->pos_start[i]);
} }
} }
@ -562,6 +562,9 @@ void PressureEqualizer::output_gcode_line(const size_t line_idx)
float pos_end2[4]; float pos_end2[4];
memcpy(pos_start, line.pos_start, sizeof(float) * 5); memcpy(pos_start, line.pos_start, sizeof(float) * 5);
memcpy(pos_end, line.pos_end, sizeof(float) * 5); memcpy(pos_end, line.pos_end, sizeof(float) * 5);
bool pos_provided_original[5];
memcpy(pos_provided_original, line.pos_provided, sizeof(bool) * 5);
if (l_steady > 0.f) { if (l_steady > 0.f) {
// There will be a steady feed segment emitted. // There will be a steady feed segment emitted.
if (accelerating) { if (accelerating) {
@ -574,7 +577,7 @@ void PressureEqualizer::output_gcode_line(const size_t line_idx)
} else { } else {
// Emit the steady feed rate segment. // Emit the steady feed rate segment.
const float t = l_steady / l; const float t = l_steady / l;
line.update_end_position(pos_start, pos_end, t); line.update_end_position(pos_start, pos_end, t, pos_provided_original);
push_line_to_output(line_idx, pos_start[4], comment); push_line_to_output(line_idx, pos_start[4], comment);
comment = nullptr; comment = nullptr;
@ -591,7 +594,7 @@ void PressureEqualizer::output_gcode_line(const size_t line_idx)
// Split the segment into pieces. // Split the segment into pieces.
for (size_t i = 1; i < nSegments; ++ i) { for (size_t i = 1; i < nSegments; ++ i) {
const float t = float(i) / float(nSegments); const float t = float(i) / float(nSegments);
line.update_end_position(pos_start, pos_end, t); line.update_end_position(pos_start, pos_end, t, pos_provided_original);
// Interpolate the feed rate at the center of the segment. // Interpolate the feed rate at the center of the segment.
push_line_to_output(line_idx, pos_start[4] + (pos_end[4] - pos_start[4]) * (float(i) - 0.5f) / float(nSegments), comment); push_line_to_output(line_idx, pos_start[4] + (pos_end[4] - pos_start[4]) * (float(i) - 0.5f) / float(nSegments), comment);
@ -600,10 +603,10 @@ void PressureEqualizer::output_gcode_line(const size_t line_idx)
} }
if (l_steady > 0.f && accelerating) { if (l_steady > 0.f && accelerating) {
line.update_end_position(pos_end2); line.update_end_position(pos_end2, pos_provided_original);
push_line_to_output(line_idx, pos_end[4], comment); push_line_to_output(line_idx, pos_end[4], comment);
} else { } else {
line.update_end_position(pos_end); line.update_end_position(pos_end, pos_provided_original);
push_line_to_output(line_idx, pos_end[4], comment); push_line_to_output(line_idx, pos_end[4], comment);
} }
} }

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

@ -178,8 +178,8 @@ private:
bool adjustable_flow = false; bool adjustable_flow = false;
void update_end_position(const float *position_end); void update_end_position(const float *position_end, const bool *position_provided_original);
void update_end_position(const float *position_start, const float *position_end, float t); void update_end_position(const float *position_start, const float *position_end, float t, const bool *position_provided_original);
}; };
using GCodeLines = std::vector<GCodeLine>; using GCodeLines = std::vector<GCodeLine>;