From a4fb29bcb833e331b917a3fa7b6549ece2051e61 Mon Sep 17 00:00:00 2001 From: thewildmage Date: Fri, 26 May 2023 10:50:13 -0600 Subject: [PATCH] Implement move_to(Vec3d). Combine with Vec2d version --- src/libslic3r/calib.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index 39d852ed18..4a77f986af 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -6,14 +6,20 @@ #include namespace Slic3r { - std::string calib_pressure_advance::move_to(Vec2d pt) { + std::string calib_pressure_advance::move_to(Vec3d pt) { std::stringstream gcode; + gcode << mp_gcodegen->retract(); - gcode << mp_gcodegen->writer().travel_to_xyz(Vec3d(pt.x(), pt.y(), 0.2)); + gcode << mp_gcodegen->writer().travel_to_xyz(pt); gcode << mp_gcodegen->unretract(); + return gcode.str(); } + std::string calib_pressure_advance::move_to(Vec2d pt) { + return calib_pressure_advance::move_to(Vec3d(pt.x(), pt.y(), 0.2)); + } + calib_pressure_advance_line::calib_pressure_advance_line(GCode* gcodegen) :mp_gcodegen(gcodegen), m_length_short(20.0), m_length_long(40.0), m_space_y(3.5), m_line_width(0.6), m_draw_numbers(true) {} std::string calib_pressure_advance_line::generate_test(double start_pa /*= 0*/, double step_pa /*= 0.002*/,