FIX: typo -- GCodeEditer -> GCodeEditor
Jira:none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I3494d28524deeaa65829865d8983f6a047502cb7
This commit is contained in:
parent
d1eb8092ce
commit
d43c77fe92
|
@ -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
|
||||
|
|
|
@ -2110,7 +2110,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
|
|||
|
||||
print.throw_if_canceled();
|
||||
|
||||
m_gcode_editer = make_unique<GCodeEditer>(*this);
|
||||
m_gcode_editer = make_unique<GCodeEditor>(*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)) {
|
||||
|
|
|
@ -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<GCodeEditer> m_gcode_editer;
|
||||
std::unique_ptr<GCodeEditor> m_gcode_editer;
|
||||
std::unique_ptr<SpiralVase> m_spiral_vase;
|
||||
#ifdef HAS_PRESSURE_EQUALIZER
|
||||
std::unique_ptr<PressureEqualizer> m_pressure_equalizer;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef slic3r_CoolingProcess_hpp_
|
||||
#define slic3r_CoolingProcess_hpp_
|
||||
#include "../libslic3r.h"
|
||||
#include "GCodeEditer.hpp"
|
||||
#include "GCodeEditor.hpp"
|
||||
|
||||
namespace Slic3r {
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "../GCode.hpp"
|
||||
#include "GCodeEditer.hpp"
|
||||
#include "GCodeEditor.hpp"
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
@ -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<PerExtruderAdjustments> &per_extruder_adjustments,
|
||||
const std::vector<int> & 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<PerExtruderAdjustments> GCodeEditer::parse_layer_gcode(
|
||||
std::vector<PerExtruderAdjustments> GCodeEditor::parse_layer_gcode(
|
||||
const std::string &gcode,
|
||||
std::vector<float> & current_pos,
|
||||
const std::vector<int> & object_label,
|
||||
|
@ -331,7 +331,7 @@ std::vector<PerExtruderAdjustments> 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.
|
|
@ -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<PerExtruderAdjustments> &per_extruder_adjustments);
|
||||
|
||||
private :
|
||||
GCodeEditer& operator=(const GCodeEditer&) = delete;
|
||||
GCodeEditor& operator=(const GCodeEditor&) = delete;
|
||||
std::vector<PerExtruderAdjustments> parse_layer_gcode(const std::string & gcode,
|
||||
std::vector<float> & current_pos,
|
||||
const std::vector<int> & object_label,
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef slic3r_Smoothing_hpp_
|
||||
#define slic3r_Smoothing_hpp_
|
||||
#include "../libslic3r.h"
|
||||
#include <libslic3r/GCode/GCodeEditer.hpp>
|
||||
#include <libslic3r/GCode/GCodeEditor.hpp>
|
||||
#include <math.h>
|
||||
|
||||
namespace Slic3r {
|
||||
|
|
Loading…
Reference in New Issue