From a1f558e54480fdd9ff900aa88583167ce1956032 Mon Sep 17 00:00:00 2001 From: thewildmage Date: Tue, 11 Jul 2023 17:44:03 -0600 Subject: [PATCH] Use clearer function names --- src/libslic3r/calib.cpp | 6 +++--- src/libslic3r/calib.hpp | 4 ++-- src/slic3r/GUI/Plater.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index 6830580435..37f060be12 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -377,7 +377,7 @@ CalibPressureAdvancePattern::CalibPressureAdvancePattern( 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(); 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; @@ -564,7 +564,7 @@ void CalibPressureAdvancePattern::refresh_pattern_config(const Model& model) m_is_delta = (updated_config.option("printable_area")->values.size() > 4); - starting_point(model); + set_starting_point(model); m_nozzle_diameter = updated_config.option("nozzle_diameter")->values[0]; m_line_width = line_width(); diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp index 27cc9fe21d..3fff3621d2 100644 --- a/src/libslic3r/calib.hpp +++ b/src/libslic3r/calib.hpp @@ -178,9 +178,9 @@ public: 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); }; - 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: 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; }; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index bfff95e02e..76923bb3f3 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -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_FILAMENT)->reload_config(); - pa_pattern.generate_gcodes(model()); + pa_pattern.generate_custom_gcodes(model()); model().calib_pa_pattern = std::make_unique(pa_pattern); }