From 3075e7f40f940aa2846ee5e6bb4757e5b73f8fe0 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 9 Nov 2018 14:25:18 +0100 Subject: [PATCH] Fixed update of ModelObject / ModelVolume configs on Print, fixed some compiler warnings. --- src/libslic3r/ModelArrange.hpp | 2 +- src/libslic3r/Print.cpp | 43 +++++++++++++++++++++++++++------- src/libslic3r/PrintConfig.hpp | 8 ++++--- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp index c64dc65ee..380095024 100644 --- a/src/libslic3r/ModelArrange.hpp +++ b/src/libslic3r/ModelArrange.hpp @@ -497,7 +497,7 @@ using ShapeData2D = ShapeData2D projectModelFromTop(const Slic3r::Model &model) { ShapeData2D ret; - auto s = std::accumulate(model.objects.begin(), model.objects.end(), 0, + auto s = std::accumulate(model.objects.begin(), model.objects.end(), size_t(0), [](size_t s, ModelObject* o){ return s + o->instances.size(); }); diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 7c876d72e..f0538fda0 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -635,6 +635,31 @@ void Print::model_volume_list_update_supports(ModelObject &model_object_dst, con } } +static inline void model_volume_list_copy_configs(ModelObject &model_object_dst, const ModelObject &model_object_src, const ModelVolume::Type type) +{ + size_t i_src, i_dst; + for (i_src = 0, i_dst = 0; i_src < model_object_src.volumes.size() && i_dst < model_object_dst.volumes.size();) { + const ModelVolume &mv_src = *model_object_src.volumes[i_src]; + ModelVolume &mv_dst = *model_object_dst.volumes[i_dst]; + if (mv_src.type() != type) { + ++ i_src; + continue; + } + if (mv_dst.type() != type) { + ++ i_dst; + continue; + } + assert(mv_src.id() == mv_dst.id()); + // Copy the ModelVolume data. + mv_dst.name = mv_src.name; + mv_dst.config = mv_src.config; + //FIXME what to do with the materials? + // mv_dst.m_material_id = mv_src.m_material_id; + ++ i_src; + ++ i_dst; + } +} + static inline bool transform3d_lower(const Transform3d &lhs, const Transform3d &rhs) { typedef Transform3d::Scalar T; @@ -786,7 +811,6 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co ModelObjectStatus(ModelID id, Status status = Unknown) : id(id), status(status) {} ModelID id; Status status; - t_config_option_keys object_config_diff; // Search by id. bool operator<(const ModelObjectStatus &rhs) const { return id < rhs.id; } }; @@ -946,15 +970,13 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co model_volume_list_update_supports(model_object, model_object_new); } if (! model_parts_differ && ! modifiers_differ) { - // Synchronize the remaining data of ModelVolumes (name, config, m_type, m_material_id) // Synchronize Object's config. - t_config_option_keys &this_object_config_diff = const_cast(*it_status).object_config_diff; - this_object_config_diff = model_object.config.diff(model_object_new.config); - if (! this_object_config_diff.empty()) - model_object.config.apply_only(model_object_new.config, this_object_config_diff, true); - if (! object_diff.empty() || ! this_object_config_diff.empty()) { + bool object_config_changed = model_object.config != model_object_new.config; + if (object_config_changed) + model_object.config = model_object_new.config; + if (! object_diff.empty() || object_config_changed) { PrintObjectConfig new_config = m_default_object_config; - normalize_and_apply_config(new_config, model_object.config); + normalize_and_apply_config(new_config, model_object.config); auto range = print_object_status.equal_range(PrintObjectStatus(model_object.id())); for (auto it = range.first; it != range.second; ++ it) { t_config_option_keys diff = it->print_object->config().diff(new_config); @@ -964,6 +986,11 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co } } } + // Synchronize (just copy) the remaining data of ModelVolumes (name, config). + //FIXME What to do with m_material_id? + model_volume_list_copy_configs(model_object /* dst */, model_object_new /* src */, ModelVolume::MODEL_PART); + model_volume_list_copy_configs(model_object /* dst */, model_object_new /* src */, ModelVolume::PARAMETER_MODIFIER); + // Copy the ModelObject name, input_file and instances. The instances will compared against PrintObject instances in the next step. model_object.name = model_object_new.name; model_object.input_file = model_object_new.input_file; model_object.clear_instances(); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index ce8a68a2d..6eacc67ce 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1020,9 +1020,10 @@ public: }; // Overrides ConfigBase::def(). Static configuration definition. Any value stored into this ConfigBase shall have its definition here. - const ConfigDef* def() const override { return &cli_config_def; } + const ConfigDef* def() const override { return &cli_config_def; } + t_config_option_keys keys() const override { return cli_config_def.keys(); } - ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false) override + ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false) override { OPT_PTR(cut); OPT_PTR(datadir); @@ -1055,7 +1056,8 @@ public: DynamicPrintAndCLIConfig(const DynamicPrintAndCLIConfig &other) : DynamicPrintConfig(other) {} // Overrides ConfigBase::def(). Static configuration definition. Any value stored into this ConfigBase shall have its definition here. - const ConfigDef* def() const override { return &s_def; } + const ConfigDef* def() const override { return &s_def; } + t_config_option_keys keys() const override { return s_def.keys(); } private: class PrintAndCLIConfigDef : public ConfigDef