From 963300d02c504d289c14f59719ccd949e7badb1c Mon Sep 17 00:00:00 2001 From: thewildmage Date: Sat, 27 May 2023 21:57:33 -0600 Subject: [PATCH] Extract convert_number_to_string function --- src/libslic3r/calib.cpp | 12 +++++++++--- src/libslic3r/calib.hpp | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index 508e7a4fd4..5f40c4d35a 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -20,6 +20,14 @@ namespace Slic3r { 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); + sNumber.erase(sNumber.find_last_not_of('.') + 1, std::string::npos); + + return sNumber; + } + std::string calib_pressure_advance::draw_digit(double startx, double starty, char c, calib_pressure_advance::DrawDigitMode mode) { auto& writer = mp_gcodegen->writer(); std::stringstream gcode; @@ -159,9 +167,7 @@ namespace Slic3r { } std::string calib_pressure_advance::draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode) { - auto sNumber = std::to_string(value); - sNumber.erase(sNumber.find_last_not_of('0') + 1, std::string::npos); - sNumber.erase(sNumber.find_last_not_of('.') + 1, std::string::npos); + auto sNumber = convert_number_to_string(value); std::stringstream gcode; gcode << mp_gcodegen->writer().set_speed(3600); diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp index f8cfb099ee..89978958b1 100644 --- a/src/libslic3r/calib.hpp +++ b/src/libslic3r/calib.hpp @@ -37,6 +37,7 @@ public: private: std::string move_to(Ved3d pt); std::string move_to(Vec2d pt); + 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); private: