juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: config: refine some small logic

Browse Source 
1. always resize filament count when not matched in full_fff_print
2. remove no-use codes in Preset::normalize

jira: no-jira
Change-Id: Ie15a5977d28f28e0f63ba84f27f98f77d16665c0
(cherry picked from commit f122c4f4ef6f476c4e8190a0872e566d690d6c25)
This commit is contained in:
lane.wei
2024-07-19 15:14:58 +08:00
committed by Noisyfox
parent f021235ceb
commit 7c48eac832
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Preset.cpp
View File

@@ -351,7 +351,7 @@ void Preset::normalize(DynamicPrintConfig &config)
static_cast<ConfigOptionVectorBase*>(opt)->resize(n, defaults.option(key)); static_cast<ConfigOptionVectorBase*>(opt)->resize(n, defaults.option(key));
} }
// The following keys are mandatory for the UI, but they are not part of FullPrintConfig, therefore they are handled separately. // The following keys are mandatory for the UI, but they are not part of FullPrintConfig, therefore they are handled separately.
for (const std::string key : { "filament_settings_id" }) { for (const std::string &key : { "filament_settings_id" }) {
auto *opt = config.option(key, false); auto *opt = config.option(key, false);
assert(opt == nullptr || opt->type() == coStrings); assert(opt == nullptr || opt->type() == coStrings);
if (opt != nullptr && opt->type() == coStrings) if (opt != nullptr && opt->type() == coStrings)

3
src/libslic3r/PresetBundle.cpp
View File

@@ -2173,7 +2173,8 @@ DynamicPrintConfig PresetBundle::full_fff_config(bool apply_extruder, std::vecto
// BBS // BBS
size_t num_filaments = this->filament_presets.size(); size_t num_filaments = this->filament_presets.size();
if (filament_maps.empty()) { //in some middle state, they may be different
if (filament_maps.size() != num_filaments) {
filament_maps.resize(num_filaments, 1); filament_maps.resize(num_filaments, 1);
} }