juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-13 03:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use clearer function names

Browse Source
This commit is contained in:
thewildmage
2023-07-11 17:44:03 -06:00
parent 9214d97791
commit a1f558e544
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/calib.cpp
View File

@@ -377,7 +377,7 @@ CalibPressureAdvancePattern::CalibPressureAdvancePattern(
this->m_draw_digit_mode = DrawDigitMode::Bottom_To_Top; this->m_draw_digit_mode = DrawDigitMode::Bottom_To_Top;
}; };
void CalibPressureAdvancePattern::starting_point(const Model& model) void CalibPressureAdvancePattern::set_starting_point(const Model& model)
{ {
ModelObject* obj = model.objects.front(); ModelObject* obj = model.objects.front();
BoundingBoxf3 bbox = BoundingBoxf3 bbox =
@@ -397,7 +397,7 @@ void CalibPressureAdvancePattern::starting_point(const Model& model)
} }
} }
void CalibPressureAdvancePattern::generate_gcodes(Model& model) void CalibPressureAdvancePattern::generate_custom_gcodes(Model& model)
{ {
std::stringstream gcode; std::stringstream gcode;
@@ -564,7 +564,7 @@ void CalibPressureAdvancePattern::refresh_pattern_config(const Model& model)
m_is_delta = (updated_config.option<ConfigOptionPoints>("printable_area")->values.size() > 4); m_is_delta = (updated_config.option<ConfigOptionPoints>("printable_area")->values.size() > 4);
starting_point(model); set_starting_point(model);
m_nozzle_diameter = updated_config.option<ConfigOptionFloats>("nozzle_diameter")->values[0]; m_nozzle_diameter = updated_config.option<ConfigOptionFloats>("nozzle_diameter")->values[0];
m_line_width = line_width(); m_line_width = line_width();

4
src/libslic3r/calib.hpp
View File

@@ -178,9 +178,9 @@ public:
double height_layer() const { return m_height_layer; }; double height_layer() const { return m_height_layer; };
double max_layer_z() const { return m_height_first_layer + ((m_num_layers - 1) * m_height_layer); }; double max_layer_z() const { return m_height_first_layer + ((m_num_layers - 1) * m_height_layer); };
void starting_point(const Model& model); void set_starting_point(const Model& model);
void generate_gcodes(Model& model); void generate_custom_gcodes(Model& model);
protected: protected:
double line_width() const { return m_nozzle_diameter * m_line_ratio / 100; }; double line_width() const { return m_nozzle_diameter * m_line_ratio / 100; };
double line_width_anchor() const { return m_nozzle_diameter * m_anchor_layer_line_ratio / 100; }; double line_width_anchor() const { return m_nozzle_diameter * m_anchor_layer_line_ratio / 100; };

2
src/slic3r/GUI/Plater.cpp
View File

@@ -8176,7 +8176,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
wxGetApp().get_tab(Preset::TYPE_PRINT)->reload_config(); wxGetApp().get_tab(Preset::TYPE_PRINT)->reload_config();
wxGetApp().get_tab(Preset::TYPE_FILAMENT)->reload_config(); wxGetApp().get_tab(Preset::TYPE_FILAMENT)->reload_config();
pa_pattern.generate_gcodes(model()); pa_pattern.generate_custom_gcodes(model());
model().calib_pa_pattern = std::make_unique<CalibPressureAdvancePattern>(pa_pattern); model().calib_pa_pattern = std::make_unique<CalibPressureAdvancePattern>(pa_pattern);
} }