3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-29 20:30:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Small Loop Memory Optimizations (#11887)

Browse source 
# Description
### `src/libslic3r/PrintApply.cpp` changes (line 318)
Change `const auto` to `const auto&` for loops (simple optimization) .


### `src/slic3r/Utils/CalibUtils.cpp` changes (lines 762, 766, 779, 783/784, 814, 816, 831, 835, 837, 1001)
Define config_pattern
`const auto& config_pattern = SuggestedConfigCalibPAPattern();` (line 762 and 814)

Replace calls of `SuggestedConfigCalibPAPattern()` with `config_pattern` (lines 766, 775, 779, 783, 784, 816, 831, 835, 837)

Change `const auto` to `const auto&` for loops (simple optimization) (lines 816, 835, 837, 1001)

*Also gets rid of the five compiler warnings out of the few hundred/thousand (when building the entire project) that warn about copying loop variables*
i.e.
```/home/neo/git/OrcaSlicer-EDIT-TEMP/src/slic3r/Utils/CalibUtils.cpp:828: note: use reference type to prevent copying
/home/neo/git/OrcaSlicer-EDIT-TEMP/src/slic3r/Utils/CalibUtils.cpp:832: warning: loop variable ‘opt’ creates a copy from type ‘const std::pair<std::__cxx11::basic_string<char>, int>’ [-Wrange-loop-construct]
  832 |     for (const auto opt : SuggestedConfigCalibPAPattern().int_pairs) { print_config.set_key_value(opt.first, new ConfigOptionInt(opt.second)); }
```
## Tests
Should have no functional difference. Contains optimizations, calibrations appear to still function well.
This commit is contained in:
Neo 2026-01-15 09:09:30 -05:00 • committed by GitHub
parent 01596888c7
commit a5f00c4138
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/PrintApply.cpp
View file

@ -315,7 +315,7 @@ static bool is_printable_filament_changed(const DynamicPrintConfig& new_full_con
}
Polygons split_polys;
for (const Polygon poly : extruder_polys) {
for (const Polygon& poly : extruder_polys) {
Polygons res = diff(printable_poly, poly);
if (!res.empty()) { split_polys.emplace_back(res[0]); }
}

23
src/slic3r/Utils/CalibUtils.cpp
View file

@ -759,10 +759,11 @@ void CalibUtils::calib_pa_pattern(const CalibInfo &calib_info, Model& model)
full_config.apply(print_config);
full_config.apply(filament_config);
full_config.apply(printer_config);
const auto& config_pattern = SuggestedConfigCalibPAPattern();
float nozzle_diameter = printer_config.option<ConfigOptionFloats>("nozzle_diameter")->get_at(0);
for (const auto& opt : SuggestedConfigCalibPAPattern().float_pairs) {
for (const auto& opt : config_pattern.float_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second));
}
@ -771,16 +772,16 @@ void CalibUtils::calib_pa_pattern(const CalibInfo &calib_info, Model& model)
full_config, print_config.get_abs_value("line_width"),
print_config.get_abs_value("layer_height"), calib_info.extruder_id, 0)));
for (const auto& opt : SuggestedConfigCalibPAPattern().nozzle_ratio_pairs) {
for (const auto& opt : config_pattern.nozzle_ratio_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloatOrPercent(nozzle_diameter * opt.second / 100, false));
}
for (const auto& opt : SuggestedConfigCalibPAPattern().int_pairs) {
for (const auto& opt : config_pattern.int_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionInt(opt.second));
}
print_config.set_key_value(SuggestedConfigCalibPAPattern().brim_pair.first,
new ConfigOptionEnum<BrimType>(SuggestedConfigCalibPAPattern().brim_pair.second));
print_config.set_key_value(config_pattern.brim_pair.first,
new ConfigOptionEnum<BrimType>(config_pattern.brim_pair.second));
//DynamicPrintConfig full_config;
full_config.apply(FullPrintConfig::defaults());
@ -810,7 +811,9 @@ void CalibUtils::set_for_auto_pa_model_and_config(const std::vector<CalibInfo> &
float nozzle_diameter = full_config.option<ConfigOptionFloats>("nozzle_diameter")->get_at(0);
int extruder_count = full_config.option<ConfigOptionFloats>("nozzle_diameter")->values.size();
for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) { print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second)); }
const auto& config_pattern = SuggestedConfigCalibPAPattern();
for (const auto& opt : config_pattern.float_pairs) { print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second)); }
std::vector<CalibInfo> sorted_calib_infos = calib_infos;
std::sort(sorted_calib_infos.begin(), sorted_calib_infos.end(), [](const CalibInfo &left_item, const CalibInfo &right_item) {
@ -825,13 +828,13 @@ void CalibUtils::set_for_auto_pa_model_and_config(const std::vector<CalibInfo> &
print_config.get_abs_value("layer_height"), calib_info.extruder_id, 0)));
}
for (const auto opt : SuggestedConfigCalibPAPattern().nozzle_ratio_pairs) {
for (const auto& opt : config_pattern.nozzle_ratio_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloatOrPercent(nozzle_diameter * opt.second / 100, false));
}
for (const auto opt : SuggestedConfigCalibPAPattern().int_pairs) { print_config.set_key_value(opt.first, new ConfigOptionInt(opt.second)); }
for (const auto& opt : config_pattern.int_pairs) { print_config.set_key_value(opt.first, new ConfigOptionInt(opt.second)); }
print_config.set_key_value(SuggestedConfigCalibPAPattern().brim_pair.first, new ConfigOptionEnum<BrimType>(SuggestedConfigCalibPAPattern().brim_pair.second));
print_config.set_key_value(config_pattern.brim_pair.first, new ConfigOptionEnum<BrimType>(config_pattern.brim_pair.second));
auto* _wall_generator = print_config.option<ConfigOptionEnum<PerimeterGeneratorType>>("wall_generator");
_wall_generator->value = PerimeterGeneratorType::Arachne;
@ -995,7 +998,7 @@ bool CalibUtils::calib_generic_auto_pa_cali(const std::vector<CalibInfo> &calib_
js["nozzle_diameter"] = nozzle_diameter;
std::string filament_ids;
for (const auto calib_info : calib_infos) {
for (const auto& calib_info : calib_infos) {
filament_ids += calib_info.filament_prest->filament_id;
filament_ids += " ";
}