From 0874c000dfb28ab7915c6760b1864c743da706b2 Mon Sep 17 00:00:00 2001
From: thewildmage <cecilia@hey.com>
Date: Thu, 25 May 2023 17:42:10 -0600
Subject: [PATCH] Share move_to function with PA lines and patterns

---
 src/libslic3r/calib.cpp | 15 +++++++--------
 src/libslic3r/calib.hpp |  8 ++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp
index 1ed7a793e5..39d852ed18 100644
--- a/src/libslic3r/calib.cpp
+++ b/src/libslic3r/calib.cpp
@@ -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();
diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp
index 76e111bfe1..23e054a7fc 100644
--- a/src/libslic3r/calib.hpp
+++ b/src/libslic3r/calib.hpp
@@ -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);