juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-31 13:57:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make DrawDigitMode options more clear

Browse Source
This commit is contained in:
thewildmage
2023-06-05 00:50:27 -06:00
parent 5ff4d2a8bc
commit b59c643615
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/calib.cpp
View File

@@ -66,7 +66,7 @@ std::string CalibPressureAdvance::draw_digit(double startx, double starty, char
Vec2d gap_p0_toward_p3, gap_p2_toward_p3; Vec2d gap_p0_toward_p3, gap_p2_toward_p3;
Vec2d dot_direction; Vec2d dot_direction;
if (mode == CalibPressureAdvance::DrawDigitMode::Vertical) { if (mode == CalibPressureAdvance::DrawDigitMode::Bottom_To_Top) {
// 1-------2-------5 // 1-------2-------5
// | | | // | | |
// | | | // | | |
@@ -284,7 +284,7 @@ std::string CalibPressureAdvanceLine::print_pa_lines(double start_x, double star
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), e * 7); gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), e * 7);
for (int i = 0; i < num; i += 2) { for (int i = 0; i < num; i += 2) {
gcode << draw_number(start_x + m_length_short + m_length_long + m_length_short + 3, y_pos + i * m_space_y + m_space_y / 2, start_pa + i * step_pa); gcode << draw_number(start_x + m_length_short + m_length_long + m_length_short + 3, y_pos + i * m_space_y + m_space_y / 2, start_pa + i * step_pa, DrawDigitMode::Left_To_Right);
} }
} }
return gcode.str(); return gcode.str();
@@ -718,7 +718,7 @@ std::string CalibPressureAdvancePattern::print_pa_pattern(PatternCalc& calc)
current_glyph_start_x, current_glyph_start_x,
calc.pattern_start_y + calc.frame_size_y + m_glyph_padding_vertical + line_width(), calc.pattern_start_y + calc.frame_size_y + m_glyph_padding_vertical + line_width(),
calc.start_pa + (j * calc.step_pa), calc.start_pa + (j * calc.step_pa),
DrawDigitMode::Vertical DrawDigitMode::Bottom_To_Top
); );
} }
} }

4
src/libslic3r/calib.hpp
View File

@@ -32,8 +32,8 @@ protected:
~CalibPressureAdvance() { }; ~CalibPressureAdvance() { };
enum class DrawDigitMode { enum class DrawDigitMode {
Horizontal = 0, Left_To_Right = 0,
Vertical Bottom_To_Top
}; };
std::string move_to(Vec2d pt, std::string comment = std::string()); std::string move_to(Vec2d pt, std::string comment = std::string());