From c999eeebf84ed988c37eddd50048fe3c059369d7 Mon Sep 17 00:00:00 2001 From: thewildmage Date: Mon, 29 May 2023 22:28:51 -0600 Subject: [PATCH] Remove unused move_to overload, accept move_to comments --- src/libslic3r/calib.cpp | 12 ++++++------ src/libslic3r/calib.hpp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index 91ab20e042..3e814e6526 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -6,20 +6,20 @@ #include namespace Slic3r { - std::string calib_pressure_advance::move_to(Vec3d pt) { + std::string calib_pressure_advance::move_to(Vec2d pt, std::string comment = std::string()) { std::stringstream gcode; gcode << mp_gcodegen->retract(); - gcode << mp_gcodegen->writer().travel_to_xyz(pt); + if (comment.empty()) { + gcode << mp_gcodegen->writer().travel_to_xy(pt); + } else { + gcode << mp_gcodegen->writer().travel_to_xy(pt, comment); + } 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)); - } - std::string convert_number_to_string(double num) { auto sNumber = std::to_string(value); sNumber.erase(sNumber.find_last_not_of('0') + 1, std::string::npos); diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp index ec77b045d4..c16d00c8d8 100644 --- a/src/libslic3r/calib.hpp +++ b/src/libslic3r/calib.hpp @@ -34,8 +34,7 @@ public: Vertical }; private: - std::string move_to(Ved3d pt); - std::string move_to(Vec2d pt); + std::string move_to(Vec2d pt, std::string comment = std::string()); std::string convert_number_to_string(double num); std::string draw_digit(double startx, double starty, char c, calib_pressure_advance::DrawDigitMode mode); std::string draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode);