3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 07:34:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix the extruder override logic. All role-based extruder options now default to 0, meaning no override is defined and the default (inherited) extruder is used. The default extruder option does not use the shortcut logic anymore (it was thus moved to be a CLI-specific logic)

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-03-26 00:08:15 +01:00
parent 2e6213fea6
commit 0ff33f47f1
8 changed files with 147 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

31
xs/src/Config.cpp
View file

@ -319,37 +319,6 @@ StaticConfig::keys(t_config_option_keys *keys) const {
}
}
void
StaticConfig::apply(const DynamicConfig &other, bool ignore_nonexistent) {
// clone the other config so that we can remove shortcut options after applying them
DynamicConfig other_clone = other;
// get list of option keys to apply
t_config_option_keys opt_keys;
other_clone.keys(&opt_keys);
// loop through options and apply them
for (t_config_option_keys::const_iterator opt_key = opt_keys.begin(); opt_key != opt_keys.end(); ++opt_key) {
// if this is not a shortcut, skip it
ConfigOptionDef* optdef = &(*this->def)[*opt_key];
if (optdef->shortcut.empty()) continue;
// expand the option into other_clone if it does not exist already
for (std::vector<t_config_option_key>::iterator it = optdef->shortcut.begin(); it != optdef->shortcut.end(); ++it) {
if (other_clone.has(*it)) continue;
ConfigOption* my_opt = other_clone.option(*it, true);
// not the most efficient way, but easier than casting pointers to subclasses
my_opt->deserialize( other_clone.option(*opt_key)->serialize() );
}
// remove the shortcut option from other_clone
other_clone.erase(*opt_key);
}
static_cast<ConfigBase*>(this)->apply(other_clone, ignore_nonexistent);
}
const ConfigOption*
StaticConfig::option(const t_config_option_key opt_key) const
{