mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: config: add logic to apply params to object/region config with multi-extruder 

JIRA: no-jira
Change-Id: Ieab98cd8d031e5ca82a3aad2d0b89d8ae4a794f1
This commit is contained in:
lane.wei 2024-07-13 11:16:38 +08:00
parent c9736865ef
commit 3179fd416e
6 changed files with 115 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/Config.hpp
View File

@ -355,6 +355,7 @@ public:
virtual void set(const ConfigOption* rhs, size_t start, size_t len) = 0; virtual void set(const ConfigOption* rhs, size_t start, size_t len) = 0;
virtual void set_with_restore(const ConfigOptionVectorBase* rhs, std::vector<int>& restore_index, int stride) = 0; virtual void set_with_restore(const ConfigOptionVectorBase* rhs, std::vector<int>& restore_index, int stride) = 0;
virtual void set_only_diff(const ConfigOptionVectorBase* rhs, std::vector<int>& diff_index, int stride) = 0; virtual void set_only_diff(const ConfigOptionVectorBase* rhs, std::vector<int>& diff_index, int stride) = 0;
virtual void set_to_index(const ConfigOptionVectorBase* rhs, std::vector<int>& dest_index, int stride) = 0;
virtual void set_with_nil(const ConfigOptionVectorBase* rhs, const ConfigOptionVectorBase* inherits, int stride) = 0; virtual void set_with_nil(const ConfigOptionVectorBase* rhs, const ConfigOptionVectorBase* inherits, int stride) = 0;
// Resize the vector of values, copy the newly added values from opt_default if provided. // Resize the vector of values, copy the newly added values from opt_default if provided.
virtual void resize(size_t n, const ConfigOption *opt_default = nullptr) = 0; virtual void resize(size_t n, const ConfigOption *opt_default = nullptr) = 0;
@ -532,6 +533,29 @@ public:
throw ConfigurationError("ConfigOptionVector::set_only_diff(): Assigning an incompatible type"); throw ConfigurationError("ConfigOptionVector::set_only_diff(): Assigning an incompatible type");
} }
//set a item related with extruder variants when apply static config with dynamic config
//rhs: item from dynamic config
//dest_index: which index in this vector need to be used
virtual void set_to_index(const ConfigOptionVectorBase* rhs, std::vector<int>& dest_index, int stride) override
{
if (rhs->type() == this->type()) {
// Assign the first value of the rhs vector.
auto other = static_cast<const ConfigOptionVector<T>*>(rhs);
T v = other->values.front();
this->values.resize(dest_index.size(), v);
for (size_t i = 0; i < dest_index.size(); i++) {
for (size_t j = 0; j < stride; j++)
{
if (!other->is_nil(dest_index[i]))
this->values[i * stride +j] = other->values[dest_index[i] * stride +j];
}
}
}
else
throw ConfigurationError("ConfigOptionVector::set_with_index(): Assigning an incompatible type");
}
//set a item related with extruder variants when saving user config, set the non-diff value of some extruder to nill //set a item related with extruder variants when saving user config, set the non-diff value of some extruder to nill
//this item has different value with inherit config //this item has different value with inherit config
//rhs: item from userconfig //rhs: item from userconfig

4
src/libslic3r/Print.hpp
View File

@ -405,7 +405,7 @@ public:
// The slicing parameters are dependent on various configuration values // The slicing parameters are dependent on various configuration values
// (layer height, first layer height, raft settings, print nozzle diameter etc). // (layer height, first layer height, raft settings, print nozzle diameter etc).
const SlicingParameters& slicing_parameters() const { return m_slicing_params; } const SlicingParameters& slicing_parameters() const { return m_slicing_params; }
static SlicingParameters slicing_parameters(const DynamicPrintConfig &full_config, const ModelObject &model_object, float object_max_z); static SlicingParameters slicing_parameters(const DynamicPrintConfig &full_config, const ModelObject &model_object, float object_max_z, std::vector<int> variant_index = std::vector<int>());
size_t num_printing_regions() const throw() { return m_shared_regions->all_regions.size(); } size_t num_printing_regions() const throw() { return m_shared_regions->all_regions.size(); }
const PrintRegion& printing_region(size_t idx) const throw() { return *m_shared_regions->all_regions[idx].get(); } const PrintRegion& printing_region(size_t idx) const throw() { return *m_shared_regions->all_regions[idx].get(); }
@ -475,7 +475,7 @@ private:
// If ! m_slicing_params.valid, recalculate. // If ! m_slicing_params.valid, recalculate.
void update_slicing_parameters(); void update_slicing_parameters();
static PrintObjectConfig object_config_from_model_object(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders); static PrintObjectConfig object_config_from_model_object(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders, std::vector<int>& variant_index);
private: private:
void make_perimeters(); void make_perimeters();

33
src/libslic3r/PrintApply.cpp
View File

@ -689,7 +689,7 @@ PrintObjectRegions::BoundingBox find_modifier_volume_extents(const PrintObjectRe
return out; return out;
} }
PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig &default_or_parent_region_config, const DynamicPrintConfig *layer_range_config, const ModelVolume &volume, size_t num_extruders); PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig &default_or_parent_region_config, const DynamicPrintConfig *layer_range_config, const ModelVolume &volume, size_t num_extruders, std::vector<int>& variant_index);
void print_region_ref_inc(PrintRegion &r) { ++ r.m_ref_cnt; } void print_region_ref_inc(PrintRegion &r) { ++ r.m_ref_cnt; }
void print_region_ref_reset(PrintRegion &r) { r.m_ref_cnt = 0; } void print_region_ref_reset(PrintRegion &r) { r.m_ref_cnt = 0; }
@ -704,7 +704,8 @@ bool verify_update_print_object_regions(
size_t num_extruders, size_t num_extruders,
const std::vector<unsigned int> &painting_extruders, const std::vector<unsigned int> &painting_extruders,
PrintObjectRegions &print_object_regions, PrintObjectRegions &print_object_regions,
const std::function<void(const PrintRegionConfig&, const PrintRegionConfig&, const t_config_option_keys&)> &callback_invalidate) const std::function<void(const PrintRegionConfig&, const PrintRegionConfig&, const t_config_option_keys&)> &callback_invalidate,
std::vector<int>& variant_index)
{ {
// Sort by ModelVolume ID. // Sort by ModelVolume ID.
model_volumes_sort_by_id(model_volumes); model_volumes_sort_by_id(model_volumes);
@ -749,7 +750,7 @@ bool verify_update_print_object_regions(
} else if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox)) } else if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox))
// Such parent region does not exist. If it is needed, then we need to reslice. // Such parent region does not exist. If it is needed, then we need to reslice.
// Only create new region for a modifier, which actually modifies config of it's parent. // Only create new region for a modifier, which actually modifies config of it's parent.
if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, **it_model_volume, num_extruders); if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, **it_model_volume, num_extruders, variant_index);
config != parent_region.region->config()) config != parent_region.region->config())
// This modifier newly overrides a region, which it did not before. We need to reslice. // This modifier newly overrides a region, which it did not before. We need to reslice.
return false; return false;
@ -757,8 +758,8 @@ bool verify_update_print_object_regions(
} }
} }
PrintRegionConfig cfg = region.parent == -1 ? PrintRegionConfig cfg = region.parent == -1 ?
region_config_from_model_volume(default_region_config, layer_range.config, **it_model_volume, num_extruders) : region_config_from_model_volume(default_region_config, layer_range.config, **it_model_volume, num_extruders, variant_index) :
region_config_from_model_volume(layer_range.volume_regions[region.parent].region->config(), nullptr, **it_model_volume, num_extruders); region_config_from_model_volume(layer_range.volume_regions[region.parent].region->config(), nullptr, **it_model_volume, num_extruders, variant_index);
if (cfg != region.region->config()) { if (cfg != region.region->config()) {
// Region configuration changed. // Region configuration changed.
if (print_region_ref_cnt(*region.region) == 0) { if (print_region_ref_cnt(*region.region) == 0) {
@ -903,7 +904,8 @@ static PrintObjectRegions* generate_print_object_regions(
const Transform3d &trafo, const Transform3d &trafo,
size_t num_extruders, size_t num_extruders,
const float xy_contour_compensation, const float xy_contour_compensation,
const std::vector<unsigned int> & painting_extruders) const std::vector<unsigned int> & painting_extruders,
std::vector<int> & variant_index)
{ {
// Reuse the old object or generate a new one. // Reuse the old object or generate a new one.
auto out = print_object_regions_old ? std::unique_ptr<PrintObjectRegions>(print_object_regions_old) : std::make_unique<PrintObjectRegions>(); auto out = print_object_regions_old ? std::unique_ptr<PrintObjectRegions>(print_object_regions_old) : std::make_unique<PrintObjectRegions>();
@ -960,7 +962,7 @@ static PrintObjectRegions* generate_print_object_regions(
// Add a model volume, assign an existing region or generate a new one. // Add a model volume, assign an existing region or generate a new one.
layer_range.volume_regions.push_back({ layer_range.volume_regions.push_back({
&volume, -1, &volume, -1,
get_create_region(region_config_from_model_volume(default_region_config, layer_range.config, volume, num_extruders)), get_create_region(region_config_from_model_volume(default_region_config, layer_range.config, volume, num_extruders, variant_index)),
bbox bbox
}); });
} else if (volume.is_negative_volume()) { } else if (volume.is_negative_volume()) {
@ -977,7 +979,7 @@ static PrintObjectRegions* generate_print_object_regions(
if (parent_volume.is_model_part() || parent_volume.is_modifier()) if (parent_volume.is_model_part() || parent_volume.is_modifier())
if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox)) { if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox)) {
// Only create new region for a modifier, which actually modifies config of it's parent. // Only create new region for a modifier, which actually modifies config of it's parent.
if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, volume, num_extruders); if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, volume, num_extruders, variant_index);
config != parent_region.region->config()) { config != parent_region.region->config()) {
added = true; added = true;
layer_range.volume_regions.push_back({ &volume, parent_region_id, get_create_region(std::move(config)), bbox }); layer_range.volume_regions.push_back({ &volume, parent_region_id, get_create_region(std::move(config)), bbox });
@ -1108,10 +1110,11 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
} }
//apply extruder related values //apply extruder related values
std::vector<int> print_variant_index;
new_full_config.update_values_to_printer_extruders(new_full_config, printer_options_with_variant_1, "printer_extruder_id", "printer_extruder_variant"); new_full_config.update_values_to_printer_extruders(new_full_config, printer_options_with_variant_1, "printer_extruder_id", "printer_extruder_variant");
new_full_config.update_values_to_printer_extruders(new_full_config, printer_options_with_variant_2, "printer_extruder_id", "printer_extruder_variant", 2); new_full_config.update_values_to_printer_extruders(new_full_config, printer_options_with_variant_2, "printer_extruder_id", "printer_extruder_variant", 2);
//update print config related with variants //update print config related with variants
new_full_config.update_values_to_printer_extruders(new_full_config, print_options_with_variant, "print_extruder_id", "print_extruder_variant"); print_variant_index = new_full_config.update_values_to_printer_extruders(new_full_config, print_options_with_variant, "print_extruder_id", "print_extruder_variant");
m_ori_full_print_config = new_full_config; m_ori_full_print_config = new_full_config;
new_full_config.update_values_to_printer_extruders_for_multiple_filaments(new_full_config, filament_options_with_variant, "filament_self_index", "filament_extruder_variant"); new_full_config.update_values_to_printer_extruders_for_multiple_filaments(new_full_config, filament_options_with_variant, "filament_self_index", "filament_extruder_variant");
@ -1403,7 +1406,7 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
if (object_config_changed) if (object_config_changed)
model_object.config.assign_config(model_object_new.config); model_object.config.assign_config(model_object_new.config);
if (! object_diff.empty() || object_config_changed || num_extruders_changed ) { if (! object_diff.empty() || object_config_changed || num_extruders_changed ) {
PrintObjectConfig new_config = PrintObject::object_config_from_model_object(m_default_object_config, model_object, num_extruders ); PrintObjectConfig new_config = PrintObject::object_config_from_model_object(m_default_object_config, model_object, num_extruders, print_variant_index);
for (const PrintObjectStatus &print_object_status : print_object_status_db.get_range(model_object)) { for (const PrintObjectStatus &print_object_status : print_object_status_db.get_range(model_object)) {
t_config_option_keys diff = print_object_status.print_object->config().diff(new_config); t_config_option_keys diff = print_object_status.print_object->config().diff(new_config);
if (! diff.empty()) { if (! diff.empty()) {
@ -1465,10 +1468,10 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
// Generate a list of trafos and XY offsets for instances of a ModelObject // Generate a list of trafos and XY offsets for instances of a ModelObject
// Producing the config for PrintObject on demand, caching it at print_object_last. // Producing the config for PrintObject on demand, caching it at print_object_last.
const PrintObject *print_object_last = nullptr; const PrintObject *print_object_last = nullptr;
auto print_object_apply_config = [this, &print_object_last, model_object, num_extruders ](PrintObject *print_object) { auto print_object_apply_config = [this, &print_object_last, model_object, num_extruders, &print_variant_index](PrintObject *print_object) {
print_object->config_apply(print_object_last ? print_object->config_apply(print_object_last ?
print_object_last->config() : print_object_last->config() :
PrintObject::object_config_from_model_object(m_default_object_config, *model_object, num_extruders )); PrintObject::object_config_from_model_object(m_default_object_config, *model_object, num_extruders, print_variant_index));
print_object_last = print_object; print_object_last = print_object;
}; };
if (old.empty()) { if (old.empty()) {
@ -1625,7 +1628,8 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
for (auto it = it_print_object; it != it_print_object_end; ++it) for (auto it = it_print_object; it != it_print_object_end; ++it)
if ((*it)->m_shared_regions != nullptr) if ((*it)->m_shared_regions != nullptr)
update_apply_status((*it)->invalidate_state_by_config_options(old_config, new_config, diff_keys)); update_apply_status((*it)->invalidate_state_by_config_options(old_config, new_config, diff_keys));
})) { },
print_variant_index)) {
// Regions are valid, just keep them. // Regions are valid, just keep them.
} else { } else {
// Regions were reshuffled. // Regions were reshuffled.
@ -1646,7 +1650,8 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
model_object_status.print_instances.front().trafo, model_object_status.print_instances.front().trafo,
num_extruders , num_extruders ,
print_object.is_mm_painted() ? 0.f : float(print_object.config().xy_contour_compensation.value), print_object.is_mm_painted() ? 0.f : float(print_object.config().xy_contour_compensation.value),
painting_extruders); painting_extruders,
print_variant_index);
} }
for (auto it = it_print_object; it != it_print_object_end; ++it) for (auto it = it_print_object; it != it_print_object_end; ++it)
if ((*it)->m_shared_regions) { if ((*it)->m_shared_regions) {

32
src/libslic3r/PrintConfig.cpp
View File

@ -5585,10 +5585,12 @@ int DynamicPrintConfig::get_index_for_extruder(int extruder_or_filament_id, std:
return ret; return ret;
} }
void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name, unsigned int stride, unsigned int extruder_id) std::vector<int> DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name, unsigned int stride, unsigned int extruder_id)
{ {
int extruder_count; int extruder_count;
bool different_extruder = printer_config.support_different_extruders(extruder_count); bool different_extruder = printer_config.support_different_extruders(extruder_count);
std::vector<int> variant_index;
if ((extruder_count > 1) || different_extruder) if ((extruder_count > 1) || different_extruder)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: different extruders processing")%__LINE__; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: different extruders processing")%__LINE__;
@ -5597,7 +5599,7 @@ void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig&
//int extruder_count = opt_nozzle_diameters->size(); //int extruder_count = opt_nozzle_diameters->size();
auto opt_extruder_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("extruder_type")); auto opt_extruder_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("extruder_type"));
auto opt_nozzle_volume_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("nozzle_volume_type")); auto opt_nozzle_volume_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("nozzle_volume_type"));
std::vector<int> variant_index;
if (extruder_id > 0 && extruder_id <= extruder_count) { if (extruder_id > 0 && extruder_id <= extruder_count) {
variant_index.resize(1); variant_index.resize(1);
@ -5636,7 +5638,7 @@ void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig&
const ConfigDef *config_def = this->def(); const ConfigDef *config_def = this->def();
if (!config_def) { if (!config_def) {
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", Line %1%: can not find config define")%__LINE__; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", Line %1%: can not find config define")%__LINE__;
return; return variant_index;
} }
for (auto& key: key_set) for (auto& key: key_set)
{ {
@ -5750,6 +5752,8 @@ void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig&
} }
} }
} }
return variant_index;
} }
void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filaments(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name) void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filaments(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name)
@ -6054,6 +6058,28 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig&
return; return;
} }
void update_static_print_config_from_dynamic(ConfigBase& config, const DynamicPrintConfig& dest_config, std::vector<int> variant_index, std::set<std::string>& key_set1, int stride)
{
if (variant_index.size() > 0) {
const t_config_option_keys &keys = dest_config.keys();
for (auto& opt : keys) {
ConfigOption *opt_src = config.option(opt);
const ConfigOption *opt_dest = dest_config.option(opt);
if (opt_src && opt_dest && (*opt_src != *opt_dest)) {
if (opt_dest->is_scalar() || (key_set1.find(opt) == key_set1.end()))
opt_src->set(opt_dest);
else {
ConfigOptionVectorBase* opt_vec_src = static_cast<ConfigOptionVectorBase*>(opt_src);
const ConfigOptionVectorBase* opt_vec_dest = static_cast<const ConfigOptionVectorBase*>(opt_dest);
opt_vec_src->set_to_index(opt_vec_dest, variant_index, stride);
}
}
}
}
else
config.apply(dest_config, true);
}
//BBS: pass map to recording all invalid valies //BBS: pass map to recording all invalid valies
//FIXME localize this function. //FIXME localize this function.
std::map<std::string, std::string> validate(const FullPrintConfig &cfg, bool under_cli) std::map<std::string, std::string> validate(const FullPrintConfig &cfg, bool under_cli)

4
src/libslic3r/PrintConfig.hpp
View File

@ -498,7 +498,7 @@ public:
bool is_using_different_extruders(); bool is_using_different_extruders();
bool support_different_extruders(int& extruder_count); bool support_different_extruders(int& extruder_count);
int get_index_for_extruder(int extruder_or_filament_id, std::string id_name, ExtruderType extruder_type, NozzleVolumeType nozzle_volume_type, std::string variant_name, unsigned int stride = 1) const; int get_index_for_extruder(int extruder_or_filament_id, std::string id_name, ExtruderType extruder_type, NozzleVolumeType nozzle_volume_type, std::string variant_name, unsigned int stride = 1) const;
void update_values_to_printer_extruders(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name, unsigned int stride = 1, unsigned int extruder_id = 0); std::vector<int> update_values_to_printer_extruders(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name, unsigned int stride = 1, unsigned int extruder_id = 0);
void update_values_to_printer_extruders_for_multiple_filaments(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name); void update_values_to_printer_extruders_for_multiple_filaments(DynamicPrintConfig& printer_config, std::set<std::string>& key_set, std::string id_name, std::string variant_name);
void update_non_diff_values_to_base_config(DynamicPrintConfig& new_config, const t_config_option_keys& keys, const std::set<std::string>& different_keys, std::string extruder_id_name, std::string extruder_variant_name, void update_non_diff_values_to_base_config(DynamicPrintConfig& new_config, const t_config_option_keys& keys, const std::set<std::string>& different_keys, std::string extruder_id_name, std::string extruder_variant_name,
@ -513,6 +513,8 @@ extern std::set<std::string> printer_options_with_variant_1;
extern std::set<std::string> printer_options_with_variant_2; extern std::set<std::string> printer_options_with_variant_2;
extern std::set<std::string> empty_options; extern std::set<std::string> empty_options;
extern void update_static_print_config_from_dynamic(ConfigBase& config, const DynamicPrintConfig& dest_config, std::vector<int> variant_index, std::set<std::string>& key_set1, int stride = 1);
void handle_legacy_sla(DynamicPrintConfig &config); void handle_legacy_sla(DynamicPrintConfig &config);
class StaticPrintConfig : public StaticConfig class StaticPrintConfig : public StaticConfig

36
src/libslic3r/PrintObject.cpp
View File

@ -2732,13 +2732,13 @@ static void clamp_exturder_to_default(ConfigOptionInt &opt, size_t num_extruders
opt.value = 1; opt.value = 1;
} }
PrintObjectConfig PrintObject::object_config_from_model_object(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders) PrintObjectConfig PrintObject::object_config_from_model_object(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders, std::vector<int>& variant_index)
{ {
PrintObjectConfig config = default_object_config; PrintObjectConfig config = default_object_config;
{ {
DynamicPrintConfig src_normalized(object.config.get()); DynamicPrintConfig src_normalized(object.config.get());
src_normalized.normalize_fdm(); src_normalized.normalize_fdm();
config.apply(src_normalized, true); update_static_print_config_from_dynamic(config, src_normalized, variant_index, print_options_with_variant, 1);
} }
// Clamp invalid extruders to the default extruder (with index 1). // Clamp invalid extruders to the default extruder (with index 1).
clamp_exturder_to_default(config.support_filament, num_extruders); clamp_exturder_to_default(config.support_filament, num_extruders);
@ -2749,7 +2749,7 @@ PrintObjectConfig PrintObject::object_config_from_model_object(const PrintObject
const std::string key_extruder { "extruder" }; const std::string key_extruder { "extruder" };
static constexpr const std::initializer_list<const std::string_view> keys_extruders { "sparse_infill_filament"sv, "solid_infill_filament"sv, "wall_filament"sv }; static constexpr const std::initializer_list<const std::string_view> keys_extruders { "sparse_infill_filament"sv, "solid_infill_filament"sv, "wall_filament"sv };
static void apply_to_print_region_config(PrintRegionConfig &out, const DynamicPrintConfig &in) static void apply_to_print_region_config(PrintRegionConfig &out, const DynamicPrintConfig &in, std::vector<int>& variant_index)
{ {
// 1) Copy the "extruder key to sparse_infill_filament and wall_filament. // 1) Copy the "extruder key to sparse_infill_filament and wall_filament.
auto *opt_extruder = in.opt<ConfigOptionInt>(key_extruder); auto *opt_extruder = in.opt<ConfigOptionInt>(key_extruder);
@ -2769,28 +2769,38 @@ static void apply_to_print_region_config(PrintRegionConfig &out, const DynamicPr
int extruder = static_cast<const ConfigOptionInt*>(it->second.get())->value; int extruder = static_cast<const ConfigOptionInt*>(it->second.get())->value;
if (extruder > 0) if (extruder > 0)
my_opt->setInt(extruder); my_opt->setInt(extruder);
} else } else {
if (*my_opt != *(it->second)) {
if (my_opt->is_scalar() || variant_index.empty() || (print_options_with_variant.find(it->first) == print_options_with_variant.end()))
my_opt->set(it->second.get()); my_opt->set(it->second.get());
//my_opt->set(it->second.get());
else {
ConfigOptionVectorBase* opt_vec_src = static_cast<ConfigOptionVectorBase*>(my_opt);
const ConfigOptionVectorBase* opt_vec_dest = static_cast<const ConfigOptionVectorBase*>(it->second.get());
opt_vec_src->set_to_index(opt_vec_dest, variant_index, 1);
}
}
}
} }
} }
PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig &default_or_parent_region_config, const DynamicPrintConfig *layer_range_config, const ModelVolume &volume, size_t num_extruders) PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig &default_or_parent_region_config, const DynamicPrintConfig *layer_range_config, const ModelVolume &volume, size_t num_extruders, std::vector<int>& variant_index)
{ {
PrintRegionConfig config = default_or_parent_region_config; PrintRegionConfig config = default_or_parent_region_config;
if (volume.is_model_part()) { if (volume.is_model_part()) {
// default_or_parent_region_config contains the Print's PrintRegionConfig. // default_or_parent_region_config contains the Print's PrintRegionConfig.
// Override with ModelObject's PrintRegionConfig values. // Override with ModelObject's PrintRegionConfig values.
apply_to_print_region_config(config, volume.get_object()->config.get()); apply_to_print_region_config(config, volume.get_object()->config.get(), variant_index);
} else { } else {
// default_or_parent_region_config contains parent PrintRegion config, which already contains ModelVolume's config. // default_or_parent_region_config contains parent PrintRegion config, which already contains ModelVolume's config.
} }
apply_to_print_region_config(config, volume.config.get()); apply_to_print_region_config(config, volume.config.get(), variant_index);
if (! volume.material_id().empty()) if (! volume.material_id().empty())
apply_to_print_region_config(config, volume.material()->config.get()); apply_to_print_region_config(config, volume.material()->config.get(), variant_index);
if (layer_range_config != nullptr) { if (layer_range_config != nullptr) {
// Not applicable to modifiers. // Not applicable to modifiers.
assert(volume.is_model_part()); assert(volume.is_model_part());
apply_to_print_region_config(config, *layer_range_config); apply_to_print_region_config(config, *layer_range_config, variant_index);
} }
// Clamp invalid extruders to the default extruder (with index 1). // Clamp invalid extruders to the default extruder (with index 1).
clamp_exturder_to_default(config.sparse_infill_filament, num_extruders); clamp_exturder_to_default(config.sparse_infill_filament, num_extruders);
@ -2834,7 +2844,7 @@ void PrintObject::update_slicing_parameters()
this->print()->config(), m_config, this->model_object()->bounding_box().max.z(), this->object_extruders()); this->print()->config(), m_config, this->model_object()->bounding_box().max.z(), this->object_extruders());
} }
SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig& full_config, const ModelObject& model_object, float object_max_z) SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig& full_config, const ModelObject& model_object, float object_max_z, std::vector<int> variant_index)
{ {
PrintConfig print_config; PrintConfig print_config;
PrintObjectConfig object_config; PrintObjectConfig object_config;
@ -2844,14 +2854,14 @@ SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig& full
default_region_config.apply(full_config, true); default_region_config.apply(full_config, true);
// BBS // BBS
size_t filament_extruders = print_config.filament_diameter.size(); size_t filament_extruders = print_config.filament_diameter.size();
object_config = object_config_from_model_object(object_config, model_object, filament_extruders); object_config = object_config_from_model_object(object_config, model_object, filament_extruders, variant_index);
std::vector<unsigned int> object_extruders; std::vector<unsigned int> object_extruders;
for (const ModelVolume* model_volume : model_object.volumes) for (const ModelVolume* model_volume : model_object.volumes)
if (model_volume->is_model_part()) { if (model_volume->is_model_part()) {
PrintRegion::collect_object_printing_extruders( PrintRegion::collect_object_printing_extruders(
print_config, print_config,
region_config_from_model_volume(default_region_config, nullptr, *model_volume, filament_extruders), region_config_from_model_volume(default_region_config, nullptr, *model_volume, filament_extruders, variant_index),
object_config.brim_type != btNoBrim && object_config.brim_width > 0., object_config.brim_type != btNoBrim && object_config.brim_width > 0.,
object_extruders); object_extruders);
for (const std::pair<const t_layer_height_range, ModelConfig> &range_and_config : model_object.layer_config_ranges) for (const std::pair<const t_layer_height_range, ModelConfig> &range_and_config : model_object.layer_config_ranges)
@ -2860,7 +2870,7 @@ SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig& full
range_and_config.second.has("solid_infill_filament")) range_and_config.second.has("solid_infill_filament"))
PrintRegion::collect_object_printing_extruders( PrintRegion::collect_object_printing_extruders(
print_config, print_config,
region_config_from_model_volume(default_region_config, &range_and_config.second.get(), *model_volume, filament_extruders), region_config_from_model_volume(default_region_config, &range_and_config.second.get(), *model_volume, filament_extruders, variant_index),
object_config.brim_type != btNoBrim && object_config.brim_width > 0., object_config.brim_type != btNoBrim && object_config.brim_width > 0.,
object_extruders); object_extruders);
} }