3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Further refactoring, C++11 conversion and code simplification.

Browse source
This commit is contained in:
bubnikv 2017-05-30 20:09:34 +02:00
parent e1ca1a82fb
commit 102329c54d
6 changed files with 107 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

22
xs/src/libslic3r/Config.cpp
View file

@ -162,25 +162,19 @@ bool unescape_strings_cstyle(const std::string &str, std::vector<std::string> &o
}
}
void ConfigBase::apply(const ConfigBase &other, bool ignore_nonexistent)
void ConfigBase::apply(const ConfigBase &other, const t_config_option_keys &keys, bool ignore_nonexistent)
{
// get list of option keys to apply
t_config_option_keys opt_keys = other.keys();
// loop through options and apply them
for (t_config_option_keys::const_iterator it = opt_keys.begin(); it != opt_keys.end(); ++it) {
ConfigOption* my_opt = this->option(*it, true);
if (my_opt == NULL) {
if (ignore_nonexistent == false) throw "Attempt to apply non-existent option";
for (const t_config_option_key &key : keys) {
ConfigOption *my_opt = this->option(key, true);
if (my_opt == nullptr) {
if (! ignore_nonexistent)
throw "Attempt to apply non-existent option";
continue;
}
// not the most efficient way, but easier than casting pointers to subclasses
bool res = my_opt->deserialize( other.option(*it)->serialize() );
if (!res) {
std::string error = "Unexpected failure when deserializing serialized value for " + *it;
CONFESS(error.c_str());
}
if (! my_opt->deserialize(other.option(key)->serialize()))
CONFESS((std::string("Unexpected failure when deserializing serialized value for ") + key).c_str());
}
}