3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: revert "FIX: fix adjust of cooling time"

Browse source 
This reverts commit 9e026a289542545d5f63cd72fb9416be1521ecc2.

This Revert "ENH: STUDIO-2221 adjust cooling time for each layer"

This reverts commit eb1fa5975eb7dc3ff832539e9bec5a04515ff2f9.

Change-Id: Iba8d0a1492b81922aad0d64df81c74cff5eabbb3
This commit is contained in:
qing.zhang 2023-02-17 13:38:31 +08:00 • committed by Lane.Wei
parent 2c1a123d91
commit 350adb6176
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libslic3r/GCode/CoolingBuffer.cpp
View file

@ -336,8 +336,7 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
// Index of an existing CoolingLine of the current adjustment, which holds the feedrate setting command // Index of an existing CoolingLine of the current adjustment, which holds the feedrate setting command
// for a sequence of extrusion moves. // for a sequence of extrusion moves.
size_t active_speed_modifier = size_t(-1); size_t active_speed_modifier = size_t(-1);
bool layer_change = false;
bool layer_print = false;
for (; *line_start != 0; line_start = line_end) for (; *line_start != 0; line_start = line_end)
{ {
while (*line_end != '\n' && *line_end != 0) while (*line_end != '\n' && *line_end != 0)
@ -348,23 +347,6 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
if (*line_end == '\n') if (*line_end == '\n')
++ line_end; ++ line_end;
CoolingLine line(0, line_start - gcode.c_str(), line_end - gcode.c_str()); CoolingLine line(0, line_start - gcode.c_str(), line_end - gcode.c_str());
std::string prefix = ";" + Slic3r::GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Layer_Change);
if (boost::starts_with(sline, prefix)) {
layer_change = true;
layer_print = false;
continue;
}
prefix = Slic3r::GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Role);
std::string role = ExtrusionEntity::role_to_string(erWipeTower).c_str();
if (layer_change && boost::starts_with(sline, ";" + prefix) && !boost::starts_with(sline, ";" + prefix + role)) {
layer_change = false;
layer_print = true;
continue;
}
if (boost::starts_with(sline, "G0 ")) if (boost::starts_with(sline, "G0 "))
line.type = CoolingLine::TYPE_G0; line.type = CoolingLine::TYPE_G0;
else if (boost::starts_with(sline, "G1 ")) else if (boost::starts_with(sline, "G1 "))
@ -447,7 +429,7 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
} }
line.feedrate = new_pos[4]; line.feedrate = new_pos[4];
assert((line.type & CoolingLine::TYPE_ADJUSTABLE) == 0 || line.feedrate > 0.f); assert((line.type & CoolingLine::TYPE_ADJUSTABLE) == 0 || line.feedrate > 0.f);
if (line.length > 0 && layer_print) if (line.length > 0)
line.time = line.length / line.feedrate; line.time = line.length / line.feedrate;
line.time_max = line.time; line.time_max = line.time;
if ((line.type & CoolingLine::TYPE_ADJUSTABLE) || active_speed_modifier != size_t(-1)) if ((line.type & CoolingLine::TYPE_ADJUSTABLE) || active_speed_modifier != size_t(-1))