diff --git a/xs/src/libslic3r/GCodeWriter.cpp b/xs/src/libslic3r/GCodeWriter.cpp index 47c7038cc..bb74ff124 100644 --- a/xs/src/libslic3r/GCodeWriter.cpp +++ b/xs/src/libslic3r/GCodeWriter.cpp @@ -13,18 +13,6 @@ namespace Slic3r { -Extruder* -GCodeWriter::extruder() -{ - return this->_extruder; -} - -std::string -GCodeWriter::extrusion_axis() const -{ - return this->_extrusion_axis; -} - void GCodeWriter::apply_print_config(const PrintConfig &print_config) { @@ -35,9 +23,8 @@ GCodeWriter::apply_print_config(const PrintConfig &print_config) void GCodeWriter::set_extruders(const std::vector &extruder_ids) { - for (std::vector::const_iterator i = extruder_ids.begin(); i != extruder_ids.end(); ++i) { + for (std::vector::const_iterator i = extruder_ids.begin(); i != extruder_ids.end(); ++i) this->extruders.insert( std::pair(*i, Extruder(*i, &this->config)) ); - } /* we enable support for multiple extruder if any extruder greater than 0 is used (even if prints only uses that one) since we need to output Tx commands @@ -523,10 +510,4 @@ GCodeWriter::unlift() return gcode; } -Pointf3 -GCodeWriter::get_position() const -{ - return this->_pos; -} - } diff --git a/xs/src/libslic3r/GCodeWriter.hpp b/xs/src/libslic3r/GCodeWriter.hpp index 51dc0d6d6..cd1eab008 100644 --- a/xs/src/libslic3r/GCodeWriter.hpp +++ b/xs/src/libslic3r/GCodeWriter.hpp @@ -19,8 +19,8 @@ public: : multiple_extruders(false), _extrusion_axis("E"), _extruder(NULL), _last_acceleration(0), _last_fan_speed(0), _lifted(0) {}; - Extruder* extruder(); - std::string extrusion_axis() const; + Extruder* extruder() const { return this->_extruder; } + std::string extrusion_axis() const { return this->_extrusion_axis; } void apply_print_config(const PrintConfig &print_config); void set_extruders(const std::vector &extruder_ids); std::string preamble(); @@ -46,8 +46,7 @@ public: std::string unretract(); std::string lift(); std::string unlift(); - Pointf3 get_position() const; - + Pointf3 get_position() const { return this->_pos; } private: std::string _extrusion_axis; Extruder* _extruder;