juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 06:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve const correctness

Browse Source
This commit is contained in:
thewildmage
2023-07-07 01:24:59 -06:00
parent 8be41ba2f4
commit 456a20ffdc
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libslic3r/calib.cpp
View File

@@ -28,14 +28,15 @@ double CalibPressureAdvance::e_per_mm(
double layer_height, double layer_height,
float filament_diameter, float filament_diameter,
float print_flow_ratio float print_flow_ratio
) { ) const
{
const Flow line_flow = Flow(line_width, layer_height, m_nozzle_diameter); const Flow line_flow = Flow(line_width, layer_height, m_nozzle_diameter);
const double filament_area = M_PI * std::pow(filament_diameter / 2, 2); const double filament_area = M_PI * std::pow(filament_diameter / 2, 2);
return line_flow.mm3_per_mm() / filament_area * print_flow_ratio; return line_flow.mm3_per_mm() / filament_area * print_flow_ratio;
} }
std::string CalibPressureAdvance::convert_number_to_string(double num) std::string CalibPressureAdvance::convert_number_to_string(double num) const
{ {
auto sNumber = std::to_string(num); auto sNumber = std::to_string(num);
sNumber.erase(sNumber.find_last_not_of('0') + 1, std::string::npos); sNumber.erase(sNumber.find_last_not_of('0') + 1, std::string::npos);
@@ -727,12 +728,12 @@ std::string CalibPressureAdvancePattern::draw_box(double min_x, double min_y, do
return gcode.str(); return gcode.str();
} }
double CalibPressureAdvancePattern::get_distance(Vec2d from, Vec2d to) double CalibPressureAdvancePattern::get_distance(Vec2d from, Vec2d to) const
{ {
return std::hypot((to.x() - from.x()), (to.y() - from.y())); return std::hypot((to.x() - from.x()), (to.y() - from.y()));
} }
double CalibPressureAdvancePattern::object_size_x() double CalibPressureAdvancePattern::object_size_x() const
{ {
return get_num_patterns() * ((m_wall_count - 1) * line_spacing_angle()) + return get_num_patterns() * ((m_wall_count - 1) * line_spacing_angle()) +
(get_num_patterns() - 1) * (m_pattern_spacing + line_width()) + (get_num_patterns() - 1) * (m_pattern_spacing + line_width()) +
@@ -741,7 +742,7 @@ double CalibPressureAdvancePattern::object_size_x()
; ;
} }
double CalibPressureAdvancePattern::object_size_y() double CalibPressureAdvancePattern::object_size_y() const
{ {
return 2 * (std::sin(to_radians(m_corner_angle) / 2) * m_wall_side_length) + return 2 * (std::sin(to_radians(m_corner_angle) / 2) * m_wall_side_length) +
max_numbering_height() + max_numbering_height() +
@@ -749,7 +750,7 @@ double CalibPressureAdvancePattern::object_size_y()
line_width_anchor(); line_width_anchor();
} }
double CalibPressureAdvancePattern::glyph_start_x(int pattern_i) double CalibPressureAdvancePattern::glyph_start_x(int pattern_i) const
{ {
// note that pattern_i is zero-based! // note that pattern_i is zero-based!
// align glyph's start with first perimeter of specified pattern // align glyph's start with first perimeter of specified pattern
@@ -776,12 +777,13 @@ double CalibPressureAdvancePattern::glyph_start_x(int pattern_i)
return x; return x;
} }
double CalibPressureAdvancePattern::glyph_length_x() { double CalibPressureAdvancePattern::glyph_length_x() const
{
// half of line_width sticks out on each side // half of line_width sticks out on each side
return line_width() + (2 * m_digit_segment_len); return line_width() + (2 * m_digit_segment_len);
} }
double CalibPressureAdvancePattern::glyph_tab_max_x() double CalibPressureAdvancePattern::glyph_tab_max_x() const
{ {
// only every other glyph is shown, starting with 1 // only every other glyph is shown, starting with 1
int num = get_num_patterns(); int num = get_num_patterns();
@@ -801,7 +803,7 @@ double CalibPressureAdvancePattern::glyph_tab_max_x()
; ;
} }
double CalibPressureAdvancePattern::max_numbering_height() double CalibPressureAdvancePattern::max_numbering_height() const
{ {
std::string::size_type most_characters = 0; std::string::size_type most_characters = 0;
const int num_patterns = get_num_patterns(); const int num_patterns = get_num_patterns();
@@ -820,7 +822,7 @@ double CalibPressureAdvancePattern::max_numbering_height()
return (most_characters * m_digit_segment_len) + ((most_characters - 1) * m_digit_gap_len); return (most_characters * m_digit_segment_len) + ((most_characters - 1) * m_digit_gap_len);
} }
double CalibPressureAdvancePattern::pattern_shift() double CalibPressureAdvancePattern::pattern_shift() const
{ {
return return
(m_anchor_perimeters - 1) * line_spacing_anchor() + (m_anchor_perimeters - 1) * line_spacing_anchor() +

44
src/libslic3r/calib.hpp
View File

@@ -39,7 +39,7 @@ protected:
}; };
virtual bool is_delta() const =0; virtual bool is_delta() const =0;
void delta_scale_bed_ext(BoundingBoxf& bed_ext) { bed_ext.scale(1.0f / 1.41421f); } void delta_scale_bed_ext(BoundingBoxf& bed_ext) const { bed_ext.scale(1.0f / 1.41421f); }
std::string move_to(Vec2d pt, GCodeWriter& writer, std::string comment = std::string()); std::string move_to(Vec2d pt, GCodeWriter& writer, std::string comment = std::string());
double e_per_mm( double e_per_mm(
@@ -47,11 +47,11 @@ protected:
double layer_height, double layer_height,
float filament_diameter, float filament_diameter,
float print_flow_ratio float print_flow_ratio
); ) const;
double speed_adjust(int speed) const { return speed * 60; }; double speed_adjust(int speed) const { return speed * 60; };
std::string convert_number_to_string(double num); std::string convert_number_to_string(double num) const;
double number_spacing() { return m_digit_segment_len + m_digit_gap_len; }; double number_spacing() const { return m_digit_segment_len + m_digit_gap_len; };
std::string draw_digit( std::string draw_digit(
double startx, double startx,
double starty, double starty,
@@ -214,7 +214,7 @@ protected:
int anchor_perimeters() const { return m_anchor_perimeters; }; int anchor_perimeters() const { return m_anchor_perimeters; };
double encroachment() const { return m_encroachment; }; double encroachment() const { return m_encroachment; };
private: private:
int get_num_patterns() const const int get_num_patterns() const
{ {
return std::ceil((m_params.end - m_params.start) / m_params.step + 1); return std::ceil((m_params.end - m_params.start) / m_params.step + 1);
} }
@@ -223,7 +223,7 @@ private:
std::string draw_box(double min_x, double min_y, double size_x, double size_y, DrawBoxOptArgs opt_args); std::string draw_box(double min_x, double min_y, double size_x, double size_y, DrawBoxOptArgs opt_args);
double to_radians(double degrees) const { return degrees * M_PI / 180; }; double to_radians(double degrees) const { return degrees * M_PI / 180; };
double get_distance(Vec2d from, Vec2d to); double get_distance(Vec2d from, Vec2d to) const;
/* /*
from slic3r documentation: spacing = extrusion_width - layer_height * (1 - PI/4) from slic3r documentation: spacing = extrusion_width - layer_height * (1 - PI/4)
@@ -231,26 +231,28 @@ private:
https://manual.slic3r.org/advanced/flow-math https://manual.slic3r.org/advanced/flow-math
https://ellis3dp.com/Print-Tuning-Guide/articles/misconceptions.html#two-04mm-perimeters--08mm https://ellis3dp.com/Print-Tuning-Guide/articles/misconceptions.html#two-04mm-perimeters--08mm
*/ */
double line_spacing() { return line_width() - m_height_layer * (1 - M_PI / 4); }; double line_spacing() const { return line_width() - m_height_layer * (1 - M_PI / 4); };
double line_spacing_anchor() { return line_width_anchor() - m_height_first_layer * (1 - M_PI / 4); }; double line_spacing_anchor() const { return line_width_anchor() - m_height_first_layer * (1 - M_PI / 4); };
double line_spacing_angle() { return line_spacing() / std::sin(to_radians(m_corner_angle) / 2); }; double line_spacing_angle() const { return line_spacing() / std::sin(to_radians(m_corner_angle) / 2); };
double object_size_x(); double object_size_x() const;
double object_size_y(); double object_size_y() const;
double frame_size_y() { return std::sin(to_radians(double(m_corner_angle) / 2)) * m_wall_side_length * 2; }; double frame_size_y() const { return std::sin(to_radians(double(m_corner_angle) / 2)) * m_wall_side_length * 2; };
double glyph_start_x(int pattern_num = 0); double glyph_start_x(int pattern_i = 0) const;
double glyph_length_x(); double glyph_length_x() const;
double glyph_tab_max_x(); double glyph_tab_max_x() const;
double max_numbering_height(); double max_numbering_height() const;
double pattern_shift(); double pattern_shift() const;
double print_size_x() { return object_size_x() + pattern_shift(); }; double print_size_x() const { return object_size_x() + pattern_shift(); };
double print_size_y() { return object_size_y(); }; double print_size_y() const { return object_size_y(); };
const Calib_Params& m_params; const Calib_Params& m_params;
const PrintConfig& m_config; const DynamicPrintConfig m_initial_config;
GCodeWriter& m_writer; Model& m_model;
const bool& m_is_bbl_machine;
const Vec3d& m_origin;
Vec3d m_starting_point; Vec3d m_starting_point;