juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-01 07:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: parameters modify of printer preset

Browse Source 
Ensure correct behavior when modifying parameters of printer preset

Change-Id: Ic627a8e202bf4224b742336cc43ac611ddc5c997
(cherry picked from commit 366a14d8f715cbeca3d0f70a4727d91b6f0ca82e)
This commit is contained in:
zhimin.zeng
2024-06-28 09:35:56 +08:00
committed by Noisyfox
parent a94b0e3dba
commit fab6b21e4d
7 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode/ToolOrdering.hpp
View File

@@ -157,7 +157,7 @@ public:
ToolOrdering(const Print& print, unsigned int first_extruder, bool prime_multi_material = false);
void clear() {
m_layer_tools.clear(); m_tool_order_cache.clear();
m_layer_tools.clear(); m_tool_order_cache.clear();
}
// Only valid for non-sequential print:

44
src/libslic3r/PrintConfig.cpp
View File

@@ -7160,11 +7160,15 @@ std::set<std::string> filament_options_with_variant = {
"filament_extruder_variant"
};
std::set<std::string> printer_options_with_variant_1 = {
/*"extruder_type",
// Parameters that are the same as the number of extruders
std::set<std::string> printer_extruder_options = {
"extruder_type",
"nozzle_diameter",
"nozzle_volume_type".
"min_layer_height",
"nozzle_volume_type"
};
std::set<std::string> printer_options_with_variant_1 = {
/*"min_layer_height",
"max_layer_height",*/
//"retraction_length",
"z_hop",
@@ -7439,6 +7443,33 @@ void handle_legacy_sla(DynamicPrintConfig &config)
}
}
size_t DynamicPrintConfig::get_parameter_size(const std::string& param_name, size_t extruder_nums)
{
if (extruder_nums > 1) {
size_t volume_type_size = 2;
auto nozzle_volume_type_opt = dynamic_cast<const ConfigOptionEnumsGeneric *>(this->option("nozzle_volume_type"));
if (nozzle_volume_type_opt) {
volume_type_size = nozzle_volume_type_opt->values.size();
}
if (printer_options_with_variant_1.count(param_name) > 0) {
return extruder_nums * volume_type_size;
}
else if (printer_options_with_variant_2.count(param_name) > 0) {
return extruder_nums * volume_type_size * 2;
}
else if (filament_options_with_variant.count(param_name) > 0) {
return extruder_nums * volume_type_size;
}
else if (print_options_with_variant.count(param_name) > 0) {
return extruder_nums * volume_type_size;
}
else {
return extruder_nums;
}
}
return extruder_nums;
}
void DynamicPrintConfig::set_num_extruders(unsigned int num_extruders)
{
const auto &defaults = FullPrintConfig::defaults();
@@ -7450,8 +7481,9 @@ void DynamicPrintConfig::set_num_extruders(unsigned int num_extruders)
auto *opt = this->option(key, false);
assert(opt != nullptr);
assert(opt->is_vector());
if (opt != nullptr && opt->is_vector())
static_cast<ConfigOptionVectorBase*>(opt)->resize(num_extruders, defaults.option(key));
if (opt != nullptr && opt->is_vector()) {
static_cast<ConfigOptionVectorBase*>(opt)->resize(get_parameter_size(key, num_extruders), defaults.option(key));
}
}
}

2
src/libslic3r/PrintConfig.hpp
View File

@@ -576,6 +576,7 @@ public:
//return the changed param set
t_config_option_keys normalize_fdm_2(int num_objects, int used_filaments = 0);
size_t get_parameter_size(const std::string& param_name, size_t extruder_nums);
void set_num_extruders(unsigned int num_extruders);
// BBS
@@ -609,6 +610,7 @@ public:
bool is_custom_defined();
};
extern std::set<std::string> printer_extruder_options;
extern std::set<std::string> print_options_with_variant;
extern std::set<std::string> filament_options_with_variant;
extern std::set<std::string> printer_options_with_variant_1;