juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-14 16:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract shared number drawing variables

Browse Source
This commit is contained in:
thewildmage
2023-05-27 21:57:11 -06:00
parent 94ef3986f2
commit de5b10f231
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/calib.cpp
View File

@@ -159,7 +159,6 @@ namespace Slic3r {
}
std::string calib_pressure_advance::draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode) {
double spacing = 3.0;
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);
@@ -167,10 +166,9 @@ namespace Slic3r {
gcode << mp_gcodegen->writer().set_speed(3600);
for (int i = 0; i < sNumber.length(); ++i) {
if (i > 5)
if (i > m_max_number_length)
break;
gcode << draw_digit(startx + i * spacing, starty, sNumber[i], mode);
gcode << draw_digit(startx + i * m_number_spacing, starty, sNumber[i], mode);
}
return gcode.str();

3
src/libslic3r/calib.hpp
View File

@@ -39,6 +39,9 @@ private:
std::string move_to(Vec2d pt);
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:
int m_max_number_length {5};
double m_number_spacing {3.0};
}
class calib_pressure_advance_line: public calib_pressure_advance