diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 867dfece9..45bf47a29 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -139,8 +139,8 @@ set(lisbslic3r_sources Format/svg.cpp GCode/ThumbnailData.cpp GCode/ThumbnailData.hpp - GCode/GCodeEditer.cpp - GCode/GCodeEditer.hpp + GCode/GCodeEditor.cpp + GCode/GCodeEditor.hpp GCode/PostProcessor.cpp GCode/PostProcessor.hpp # GCode/PressureEqualizer.cpp diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index ea551a22c..d02eb9aec 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2110,7 +2110,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato print.throw_if_canceled(); - m_gcode_editer = make_unique(*this); + m_gcode_editer = make_unique(*this); m_gcode_editer->set_current_extruder(initial_extruder_id); int extruder_id = get_extruder_id(initial_extruder_id); @@ -2419,7 +2419,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato if (finished_objects > 0) { // Move to the origin position for the copy we're going to print. // This happens before Z goes down to layer 0 again, so that no collision happens hopefully. - m_enable_cooling_markers = false; // we're not filtering these moves through GCodeEditer + m_enable_cooling_markers = false; // we're not filtering these moves through GCodeEditor m_avoid_crossing_perimeters.use_external_mp_once(); // BBS. change tool before moving to origin point. if (m_writer.need_toolchange(initial_extruder_id)) { diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 0020d8af6..02b8b3e22 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -9,7 +9,7 @@ #include "PlaceholderParser.hpp" #include "PrintConfig.hpp" #include "GCode/AvoidCrossingPerimeters.hpp" -#include "GCode/GCodeEditer.hpp" +#include "GCode/GCodeEditor.hpp" #include "GCode/RetractWhenCrossingPerimeters.hpp" #include "GCode/SpiralVase.hpp" #include "GCode/ToolOrdering.hpp" @@ -523,7 +523,7 @@ private: Point m_last_pos; bool m_last_pos_defined; bool m_last_scarf_seam_flag; - std::unique_ptr m_gcode_editer; + std::unique_ptr m_gcode_editer; std::unique_ptr m_spiral_vase; #ifdef HAS_PRESSURE_EQUALIZER std::unique_ptr m_pressure_equalizer; diff --git a/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp index 6768df485..684492100 100644 --- a/src/libslic3r/GCode/CoolingBuffer.hpp +++ b/src/libslic3r/GCode/CoolingBuffer.hpp @@ -1,7 +1,7 @@ #ifndef slic3r_CoolingProcess_hpp_ #define slic3r_CoolingProcess_hpp_ #include "../libslic3r.h" -#include "GCodeEditer.hpp" +#include "GCodeEditor.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/GCodeEditer.cpp b/src/libslic3r/GCode/GCodeEditor.cpp similarity index 98% rename from src/libslic3r/GCode/GCodeEditer.cpp rename to src/libslic3r/GCode/GCodeEditor.cpp index 5c0905fea..ef86504a5 100644 --- a/src/libslic3r/GCode/GCodeEditer.cpp +++ b/src/libslic3r/GCode/GCodeEditor.cpp @@ -1,5 +1,5 @@ #include "../GCode.hpp" -#include "GCodeEditer.hpp" +#include "GCodeEditor.hpp" #include #include #include @@ -16,7 +16,7 @@ namespace Slic3r { -GCodeEditer::GCodeEditer(GCode &gcodegen) : m_config(gcodegen.config()), m_toolchange_prefix(gcodegen.writer().toolchange_prefix()), m_current_extruder(0) +GCodeEditor::GCodeEditor(GCode &gcodegen) : m_config(gcodegen.config()), m_toolchange_prefix(gcodegen.writer().toolchange_prefix()), m_current_extruder(0) { this->reset(gcodegen.writer().get_position()); @@ -28,7 +28,7 @@ GCodeEditer::GCodeEditer(GCode &gcodegen) : m_config(gcodegen.config()), m_toolc } } -void GCodeEditer::reset(const Vec3d &position) +void GCodeEditor::reset(const Vec3d &position) { // BBS: add I and J axis to store center of arc m_current_pos.assign(7, 0.f); @@ -68,7 +68,7 @@ static void mark_node_pos( } -std::string GCodeEditer::process_layer(std::string && gcode, +std::string GCodeEditor::process_layer(std::string && gcode, const size_t layer_id, std::vector &per_extruder_adjustments, const std::vector & object_label, @@ -96,7 +96,7 @@ std::string GCodeEditer::process_layer(std::string && gcod //native-resource://sandbox_fs/webcontent/resource/assets/img/41ecc25c56.png // Parse the layer G-code for the moves, which could be adjusted. // Return the list of parsed lines, bucketed by an extruder. -std::vector GCodeEditer::parse_layer_gcode( +std::vector GCodeEditor::parse_layer_gcode( const std::string &gcode, std::vector & current_pos, const std::vector & object_label, @@ -331,7 +331,7 @@ std::vector GCodeEditer::parse_layer_gcode( // Apply slow down over G-code lines stored in per_extruder_adjustments, enable fan if needed. // Returns the adjusted G-code. -std::string GCodeEditer::write_layer_gcode( +std::string GCodeEditor::write_layer_gcode( // Source G-code for the current layer. const std::string &gcode, // ID of the current layer, used to disable fan for the first n layers. diff --git a/src/libslic3r/GCode/GCodeEditer.hpp b/src/libslic3r/GCode/GCodeEditor.hpp similarity index 99% rename from src/libslic3r/GCode/GCodeEditer.hpp rename to src/libslic3r/GCode/GCodeEditor.hpp index 57d1ee7ef..2c241af7c 100644 --- a/src/libslic3r/GCode/GCodeEditer.hpp +++ b/src/libslic3r/GCode/GCodeEditor.hpp @@ -233,9 +233,9 @@ struct PerExtruderAdjustments // For example, some materials may not like to print too slowly, while with some materials // we may slow down significantly. // -class GCodeEditer { +class GCodeEditor { public: - GCodeEditer(GCode &gcodegen); + GCodeEditor(GCode &gcodegen); void reset(const Vec3d &position); void set_current_extruder(unsigned int extruder_id) { @@ -255,7 +255,7 @@ public: std::string write_layer_gcode(const std::string &gcode, size_t layer_id, float layer_time, std::vector &per_extruder_adjustments); private : - GCodeEditer& operator=(const GCodeEditer&) = delete; + GCodeEditor& operator=(const GCodeEditor&) = delete; std::vector parse_layer_gcode(const std::string & gcode, std::vector & current_pos, const std::vector & object_label, diff --git a/src/libslic3r/GCode/Smoothing.hpp b/src/libslic3r/GCode/Smoothing.hpp index 837ed8557..fad138986 100644 --- a/src/libslic3r/GCode/Smoothing.hpp +++ b/src/libslic3r/GCode/Smoothing.hpp @@ -1,7 +1,7 @@ #ifndef slic3r_Smoothing_hpp_ #define slic3r_Smoothing_hpp_ #include "../libslic3r.h" -#include +#include #include namespace Slic3r {