juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-12 11:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract convert_number_to_string function

Browse Source
This commit is contained in:
thewildmage
2023-05-27 21:57:33 -06:00
parent de5b10f231
commit 963300d02c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libslic3r/calib.cpp
View File

@@ -20,6 +20,14 @@ namespace Slic3r {
return calib_pressure_advance::move_to(Vec3d(pt.x(), pt.y(), 0.2)); 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) { std::string calib_pressure_advance::draw_digit(double startx, double starty, char c, calib_pressure_advance::DrawDigitMode mode) {
auto& writer = mp_gcodegen->writer(); auto& writer = mp_gcodegen->writer();
std::stringstream gcode; 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) { std::string calib_pressure_advance::draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode) {
auto sNumber = std::to_string(value); auto sNumber = convert_number_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);
std::stringstream gcode; std::stringstream gcode;
gcode << mp_gcodegen->writer().set_speed(3600); gcode << mp_gcodegen->writer().set_speed(3600);

1
src/libslic3r/calib.hpp
View File

@@ -37,6 +37,7 @@ public:
private: private:
std::string move_to(Ved3d pt); std::string move_to(Ved3d pt);
std::string move_to(Vec2d 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_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); std::string draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode);
private: private: