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

Share move_to function with PA lines and patterns

Browse Source
This commit is contained in:
thewildmage
2023-05-25 17:42:10 -06:00
parent 3ccde0fe69
commit 0874c000df
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libslic3r/calib.cpp
View File

@@ -6,6 +6,13 @@
#include <map>
namespace Slic3r {
std::string calib_pressure_advance::move_to(Vec2d pt) {
std::stringstream gcode;
gcode << mp_gcodegen->retract();
gcode << mp_gcodegen->writer().travel_to_xyz(Vec3d(pt.x(), pt.y(), 0.2));
gcode << mp_gcodegen->unretract();
return gcode.str();
}
calib_pressure_advance_line::calib_pressure_advance_line(GCode* gcodegen) :mp_gcodegen(gcodegen), m_length_short(20.0), m_length_long(40.0), m_space_y(3.5), m_line_width(0.6), m_draw_numbers(true) {}
@@ -35,14 +42,6 @@ namespace Slic3r {
return print_pa_lines(startx, starty, start_pa, step_pa, count);
}
std::string calib_pressure_advance_line::move_to(Vec2d pt) {
std::stringstream gcode;
gcode << mp_gcodegen->retract();
gcode << mp_gcodegen->writer().travel_to_xyz(Vec3d(pt.x(), pt.y(), 0.2));
gcode << mp_gcodegen->unretract();
return gcode.str();
}
std::string calib_pressure_advance_line::print_pa_lines(double start_x, double start_y, double start_pa, double step_pa, int num) {
auto& writer = mp_gcodegen->writer();

8
src/libslic3r/calib.hpp
View File

@@ -25,7 +25,12 @@ struct Calib_Params
CalibMode mode;
};
class calib_pressure_advance_line
class calib_pressure_advance {
private:
std::string move_to(Vec2d pt);
}
class calib_pressure_advance_line: public calib_pressure_advance
{
public:
calib_pressure_advance_line(GCode* gcodegen);
@@ -40,7 +45,6 @@ public:
bool& draw_numbers() { return m_draw_numbers; }
private:
std::string move_to(Vec2d pt);
std::string print_pa_lines(double start_x, double start_y, double start_pa, double step_pa, int num);
std::string draw_digit(double startx, double starty, char c);
std::string draw_number(double startx, double starty, double value);