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

Add missing point to the rectangular travel

Browse Source
This commit is contained in:
Martin Šach 2024-02-14 15:22:18 +01:00
parent aa5573e8b9
commit 0b4e406b28
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View File

@ -3321,7 +3321,7 @@ std::string GCodeGenerator::generate_travel_gcode(
gcode += this->m_writer.set_travel_acceleration(acceleration); gcode += this->m_writer.set_travel_acceleration(acceleration);
Vec3d previous_point{this->point_to_gcode(travel.front())}; Vec3d previous_point{this->point_to_gcode(travel.front())};
for (const Vec3crd& point : tcb::span{travel}.subspan(1)) { for (const Vec3crd& point : travel) {
const Vec3d gcode_point{this->point_to_gcode(point)}; const Vec3d gcode_point{this->point_to_gcode(point)};
gcode += this->m_writer.travel_to_xyz(previous_point, gcode_point, comment); gcode += this->m_writer.travel_to_xyz(previous_point, gcode_point, comment);

1
src/libslic3r/GCode/Travels.cpp
View File

@ -433,7 +433,6 @@ Points3 generate_travel_to_extrusion(
elevation_params.slope_end + elevation_params.blend_width / 2.0, elevation_params.slope_end + elevation_params.blend_width / 2.0,
elevation_params.parabola_points_count elevation_params.parabola_points_count
); );
Points3 result{generate_elevated_travel( Points3 result{generate_elevated_travel(
xy_path.points, ensure_points_at_distances, initial_elevation, xy_path.points, ensure_points_at_distances, initial_elevation,
ElevatedTravelFormula{elevation_params} ElevatedTravelFormula{elevation_params}

8
tests/fff_print/test_retraction.cpp
View File

@ -14,7 +14,7 @@
using namespace Slic3r; using namespace Slic3r;
using namespace Test; using namespace Test;
constexpr bool debug_files {true}; constexpr bool debug_files {false};
void check_gcode(std::initializer_list<TestMesh> meshes, const DynamicPrintConfig& config, const unsigned duplicate) { void check_gcode(std::initializer_list<TestMesh> meshes, const DynamicPrintConfig& config, const unsigned duplicate) {
constexpr std::size_t tools_count = 4; constexpr std::size_t tools_count = 4;
@ -32,6 +32,12 @@ void check_gcode(std::initializer_list<TestMesh> meshes, const DynamicPrintConfi
Test::init_print({TestMesh::cube_20x20x20}, print, model, config, false, duplicate); Test::init_print({TestMesh::cube_20x20x20}, print, model, config, false, duplicate);
std::string gcode = Test::gcode(print); std::string gcode = Test::gcode(print);
if constexpr(debug_files) {
static int count{0};
std::ofstream file{"check_gcode_" + std::to_string(count++) + ".gcode"};
file << gcode;
}
GCodeReader parser; GCodeReader parser;
parser.parse_buffer(gcode, [&] (Slic3r::GCodeReader &self, const Slic3r::GCodeReader::GCodeLine &line) { parser.parse_buffer(gcode, [&] (Slic3r::GCodeReader &self, const Slic3r::GCodeReader::GCodeLine &line) {
std::regex regex{"^T(\\d+)"}; std::regex regex{"^T(\\d+)"};