DynamicPrintConfig::normalize() renamed to normalize_fdm(),

optimization of Print::apply()
This commit is contained in:
Vojtech Bubnik 2020-09-24 19:03:09 +02:00
parent 8f04a76337
commit 7a799be426
7 changed files with 58 additions and 38 deletions

View file

@ -254,7 +254,7 @@ public:
// Overrides ConfigBase::def(). Static configuration definition. Any value stored into this ConfigBase shall have its definition here.
const ConfigDef* def() const override { return &print_config_def; }
void normalize();
void normalize_fdm();
void set_num_extruders(unsigned int num_extruders);
@ -269,14 +269,6 @@ public:
{ PrintConfigDef::handle_legacy(opt_key, value); }
};
template<typename CONFIG>
void normalize_and_apply_config(CONFIG &dst, const DynamicPrintConfig &src)
{
DynamicPrintConfig src_normalized(src);
src_normalized.normalize();
dst.apply(src_normalized, true);
}
class StaticPrintConfig : public StaticConfig
{
public:
@ -1457,8 +1449,6 @@ private:
static uint64_t s_last_timestamp;
};
template<typename CONFIG> void normalize_and_apply_config(CONFIG& dst, const ModelConfig& src) { normalize_and_apply_config(dst, src.get()); }
} // namespace Slic3r
// Serialization through the Cereal library