mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-31 12:41:20 -06:00
Removed the dead code GCode/Analyzer.cpp,hpp to simplify code navigation.
This commit is contained in:
Vojtech Bubnik
parent
7b2aca0159
commit
bb74d2da5b
4 changed files with 0 additions and 1509 deletions
|
|
@ -79,8 +79,6 @@ add_library(libslic3r STATIC
|
||||||
Format/STL.hpp
|
Format/STL.hpp
|
||||||
Format/SL1.hpp
|
Format/SL1.hpp
|
||||||
Format/SL1.cpp
|
Format/SL1.cpp
|
||||||
GCode/Analyzer.cpp
|
|
||||||
GCode/Analyzer.hpp
|
|
||||||
GCode/ThumbnailData.cpp
|
GCode/ThumbnailData.cpp
|
||||||
GCode/ThumbnailData.hpp
|
GCode/ThumbnailData.hpp
|
||||||
GCode/CoolingBuffer.cpp
|
GCode/CoolingBuffer.cpp
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,309 +0,0 @@
|
||||||
#ifndef slic3r_GCode_Analyzer_hpp_
|
|
||||||
#define slic3r_GCode_Analyzer_hpp_
|
|
||||||
|
|
||||||
#if !ENABLE_GCODE_VIEWER
|
|
||||||
|
|
||||||
#include "../libslic3r.h"
|
|
||||||
#include "../PrintConfig.hpp"
|
|
||||||
#include "../ExtrusionEntity.hpp"
|
|
||||||
|
|
||||||
#include "../Point.hpp"
|
|
||||||
#include "../GCodeReader.hpp"
|
|
||||||
|
|
||||||
namespace Slic3r {
|
|
||||||
|
|
||||||
class GCodePreviewData;
|
|
||||||
|
|
||||||
class GCodeAnalyzer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
static const std::string Extrusion_Role_Tag;
|
|
||||||
static const std::string Mm3_Per_Mm_Tag;
|
|
||||||
static const std::string Width_Tag;
|
|
||||||
static const std::string Height_Tag;
|
|
||||||
static const std::string Color_Change_Tag;
|
|
||||||
static const std::string Pause_Print_Tag;
|
|
||||||
static const std::string Custom_Code_Tag;
|
|
||||||
static const std::string End_Pause_Print_Or_Custom_Code_Tag;
|
|
||||||
|
|
||||||
static const float Default_mm3_per_mm;
|
|
||||||
static const float Default_Width;
|
|
||||||
static const float Default_Height;
|
|
||||||
|
|
||||||
enum EUnits : unsigned char
|
|
||||||
{
|
|
||||||
Millimeters,
|
|
||||||
Inches
|
|
||||||
};
|
|
||||||
|
|
||||||
enum EAxis : unsigned char
|
|
||||||
{
|
|
||||||
X,
|
|
||||||
Y,
|
|
||||||
Z,
|
|
||||||
E,
|
|
||||||
Num_Axis
|
|
||||||
};
|
|
||||||
|
|
||||||
enum EPositioningType : unsigned char
|
|
||||||
{
|
|
||||||
Absolute,
|
|
||||||
Relative
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Metadata
|
|
||||||
{
|
|
||||||
ExtrusionRole extrusion_role;
|
|
||||||
unsigned int extruder_id;
|
|
||||||
float mm3_per_mm;
|
|
||||||
float width; // mm
|
|
||||||
float height; // mm
|
|
||||||
float feedrate; // mm/s
|
|
||||||
float fan_speed; // percentage
|
|
||||||
unsigned int cp_color_id;
|
|
||||||
|
|
||||||
Metadata();
|
|
||||||
Metadata(ExtrusionRole extrusion_role, unsigned int extruder_id, float mm3_per_mm, float width, float height, float feedrate, float fan_speed, unsigned int cp_color_id = 0);
|
|
||||||
|
|
||||||
bool operator != (const Metadata& other) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct GCodeMove
|
|
||||||
{
|
|
||||||
enum EType : unsigned char
|
|
||||||
{
|
|
||||||
Noop,
|
|
||||||
Retract,
|
|
||||||
Unretract,
|
|
||||||
Tool_change,
|
|
||||||
Move,
|
|
||||||
Extrude,
|
|
||||||
Num_Types
|
|
||||||
};
|
|
||||||
|
|
||||||
EType type;
|
|
||||||
Metadata data;
|
|
||||||
Vec3f start_position;
|
|
||||||
Vec3f end_position;
|
|
||||||
float delta_extruder;
|
|
||||||
|
|
||||||
GCodeMove(EType type, ExtrusionRole extrusion_role, unsigned int extruder_id, float mm3_per_mm, float width, float height, float feedrate, const Vec3f& start_position, const Vec3f& end_position, float delta_extruder, float fan_speed, unsigned int cp_color_id = 0);
|
|
||||||
GCodeMove(EType type, const Metadata& data, const Vec3f& start_position, const Vec3f& end_position, float delta_extruder);
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef std::vector<GCodeMove> GCodeMovesList;
|
|
||||||
typedef std::map<GCodeMove::EType, GCodeMovesList> TypeToMovesMap;
|
|
||||||
typedef std::map<unsigned int, Vec2d> ExtruderOffsetsMap;
|
|
||||||
typedef std::map<unsigned int, unsigned int> ExtruderToColorMap;
|
|
||||||
|
|
||||||
private:
|
|
||||||
struct State
|
|
||||||
{
|
|
||||||
EUnits units;
|
|
||||||
EPositioningType global_positioning_type;
|
|
||||||
EPositioningType e_local_positioning_type;
|
|
||||||
Metadata data;
|
|
||||||
Vec3f start_position = Vec3f::Zero();
|
|
||||||
float cached_position[5];
|
|
||||||
float start_extrusion;
|
|
||||||
float position[Num_Axis];
|
|
||||||
float origin[Num_Axis];
|
|
||||||
unsigned int cp_color_counter = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
private:
|
|
||||||
State m_state;
|
|
||||||
GCodeReader m_parser;
|
|
||||||
TypeToMovesMap m_moves_map;
|
|
||||||
ExtruderOffsetsMap m_extruder_offsets;
|
|
||||||
unsigned int m_extruders_count;
|
|
||||||
GCodeFlavor m_gcode_flavor;
|
|
||||||
|
|
||||||
ExtruderToColorMap m_extruder_color;
|
|
||||||
|
|
||||||
// The output of process_layer()
|
|
||||||
std::string m_process_output;
|
|
||||||
|
|
||||||
public:
|
|
||||||
GCodeAnalyzer() { reset(); }
|
|
||||||
|
|
||||||
void set_extruder_offsets(const ExtruderOffsetsMap& extruder_offsets) { m_extruder_offsets = extruder_offsets; }
|
|
||||||
void set_extruders_count(unsigned int count);
|
|
||||||
|
|
||||||
void set_extrusion_axis(char axis) { m_parser.set_extrusion_axis(axis); }
|
|
||||||
|
|
||||||
void set_gcode_flavor(const GCodeFlavor& flavor) { m_gcode_flavor = flavor; }
|
|
||||||
|
|
||||||
// Reinitialize the analyzer
|
|
||||||
void reset();
|
|
||||||
|
|
||||||
// Adds the gcode contained in the given string to the analysis and returns it after removing the workcodes
|
|
||||||
const std::string& process_gcode(const std::string& gcode);
|
|
||||||
|
|
||||||
// Calculates all data needed for gcode visualization
|
|
||||||
// throws CanceledException through print->throw_if_canceled() (sent by the caller as callback).
|
|
||||||
void calc_gcode_preview_data(GCodePreviewData& preview_data, std::function<void()> cancel_callback = std::function<void()>());
|
|
||||||
|
|
||||||
// Return an estimate of the memory consumed by the time estimator.
|
|
||||||
size_t memory_used() const;
|
|
||||||
|
|
||||||
static bool is_valid_extrusion_role(ExtrusionRole role);
|
|
||||||
|
|
||||||
private:
|
|
||||||
// Processes the given gcode line
|
|
||||||
void _process_gcode_line(GCodeReader& reader, const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Move
|
|
||||||
void _processG1(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Retract
|
|
||||||
void _processG10(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Unretract
|
|
||||||
void _processG11(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Firmware controlled Retract
|
|
||||||
void _processG22(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Firmware controlled Unretract
|
|
||||||
void _processG23(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set to Absolute Positioning
|
|
||||||
void _processG90(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set to Relative Positioning
|
|
||||||
void _processG91(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set Position
|
|
||||||
void _processG92(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set extruder to absolute mode
|
|
||||||
void _processM82(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set extruder to relative mode
|
|
||||||
void _processM83(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set fan speed
|
|
||||||
void _processM106(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Disable fan
|
|
||||||
void _processM107(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Set tool (MakerWare and Sailfish flavor)
|
|
||||||
void _processM108orM135(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Recall stored home offsets
|
|
||||||
void _processM132(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Repetier: Store x, y and z position
|
|
||||||
void _processM401(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Repetier: Go to stored position
|
|
||||||
void _processM402(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Processes T line (Select Tool)
|
|
||||||
void _processT(const std::string& command);
|
|
||||||
void _processT(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Processes the tags
|
|
||||||
// Returns true if any tag has been processed
|
|
||||||
bool _process_tags(const GCodeReader::GCodeLine& line);
|
|
||||||
|
|
||||||
// Processes extrusion role tag
|
|
||||||
void _process_extrusion_role_tag(const std::string& comment, size_t pos);
|
|
||||||
|
|
||||||
// Processes mm3_per_mm tag
|
|
||||||
void _process_mm3_per_mm_tag(const std::string& comment, size_t pos);
|
|
||||||
|
|
||||||
// Processes width tag
|
|
||||||
void _process_width_tag(const std::string& comment, size_t pos);
|
|
||||||
|
|
||||||
// Processes height tag
|
|
||||||
void _process_height_tag(const std::string& comment, size_t pos);
|
|
||||||
|
|
||||||
// Processes color change tag
|
|
||||||
void _process_color_change_tag(unsigned extruder);
|
|
||||||
|
|
||||||
// Processes pause print and custom gcode tag
|
|
||||||
void _process_pause_print_or_custom_code_tag();
|
|
||||||
|
|
||||||
// Processes new layer tag
|
|
||||||
void _process_end_pause_print_or_custom_code_tag();
|
|
||||||
|
|
||||||
void _set_units(EUnits units);
|
|
||||||
EUnits _get_units() const;
|
|
||||||
|
|
||||||
void _set_global_positioning_type(EPositioningType type);
|
|
||||||
EPositioningType _get_global_positioning_type() const;
|
|
||||||
|
|
||||||
void _set_e_local_positioning_type(EPositioningType type);
|
|
||||||
EPositioningType _get_e_local_positioning_type() const;
|
|
||||||
|
|
||||||
void _set_extrusion_role(ExtrusionRole extrusion_role);
|
|
||||||
ExtrusionRole _get_extrusion_role() const;
|
|
||||||
|
|
||||||
void _set_extruder_id(unsigned int id);
|
|
||||||
unsigned int _get_extruder_id() const;
|
|
||||||
|
|
||||||
void _set_cp_color_id(unsigned int id);
|
|
||||||
unsigned int _get_cp_color_id() const;
|
|
||||||
|
|
||||||
void _set_mm3_per_mm(float value);
|
|
||||||
float _get_mm3_per_mm() const;
|
|
||||||
|
|
||||||
void _set_width(float width);
|
|
||||||
float _get_width() const;
|
|
||||||
|
|
||||||
void _set_height(float height);
|
|
||||||
float _get_height() const;
|
|
||||||
|
|
||||||
void _set_feedrate(float feedrate_mm_sec);
|
|
||||||
float _get_feedrate() const;
|
|
||||||
|
|
||||||
void _set_fan_speed(float fan_speed_percentage);
|
|
||||||
float _get_fan_speed() const;
|
|
||||||
|
|
||||||
void _set_axis_position(EAxis axis, float position);
|
|
||||||
float _get_axis_position(EAxis axis) const;
|
|
||||||
|
|
||||||
void _set_axis_origin(EAxis axis, float position);
|
|
||||||
float _get_axis_origin(EAxis axis) const;
|
|
||||||
|
|
||||||
// Sets axes position to zero
|
|
||||||
void _reset_axes_position();
|
|
||||||
// Sets origin position to zero
|
|
||||||
void _reset_axes_origin();
|
|
||||||
|
|
||||||
void _set_start_position(const Vec3f& position);
|
|
||||||
const Vec3f& _get_start_position() const;
|
|
||||||
|
|
||||||
void _set_cached_position(unsigned char axis, float position);
|
|
||||||
float _get_cached_position(unsigned char axis) const;
|
|
||||||
|
|
||||||
void _reset_cached_position();
|
|
||||||
|
|
||||||
void _set_start_extrusion(float extrusion);
|
|
||||||
float _get_start_extrusion() const;
|
|
||||||
float _get_delta_extrusion() const;
|
|
||||||
|
|
||||||
// Returns current xyz position (from m_state.position[])
|
|
||||||
Vec3f _get_end_position() const;
|
|
||||||
|
|
||||||
// Adds a new move with the given data
|
|
||||||
void _store_move(GCodeMove::EType type);
|
|
||||||
|
|
||||||
// Checks if the given int is a valid extrusion role (contained into enum ExtrusionRole)
|
|
||||||
bool _is_valid_extrusion_role(int value) const;
|
|
||||||
|
|
||||||
// All the following methods throw CanceledException through print->throw_if_canceled() (sent by the caller as callback).
|
|
||||||
void _calc_gcode_preview_extrusion_layers(GCodePreviewData& preview_data, std::function<void()> cancel_callback);
|
|
||||||
void _calc_gcode_preview_travel(GCodePreviewData& preview_data, std::function<void()> cancel_callback);
|
|
||||||
void _calc_gcode_preview_retractions(GCodePreviewData& preview_data, std::function<void()> cancel_callback);
|
|
||||||
void _calc_gcode_preview_unretractions(GCodePreviewData& preview_data, std::function<void()> cancel_callback);
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Slic3r
|
|
||||||
|
|
||||||
#endif // !ENABLE_GCODE_VIEWER
|
|
||||||
|
|
||||||
#endif /* slic3r_GCode_Analyzer_hpp_ */
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
#include "Analyzer.hpp"
|
|
||||||
#include "PreviewData.hpp"
|
#include "PreviewData.hpp"
|
||||||
#include <I18N.hpp>
|
#include <I18N.hpp>
|
||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue