mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
Fix extruder number issue when SEMM is not enabled (#8027)
* Revert ac80575b28
* Fix issue that extruder number is not initialized properly when SEMM is not enabled
This commit is contained in:
parent
fab7eaab49
commit
61331ce113
2 changed files with 19 additions and 10 deletions
|
@ -318,17 +318,27 @@ std::string Preset::remove_suffix_modified(const std::string &name)
|
|||
// Update new extruder fields at the printer profile.
|
||||
void Preset::normalize(DynamicPrintConfig &config)
|
||||
{
|
||||
// BBS
|
||||
auto* filament_diameter = dynamic_cast<const ConfigOptionFloats*>(config.option("filament_diameter"));
|
||||
if (filament_diameter != nullptr)
|
||||
// Loaded the FFF Printer settings. Verify, that all extruder dependent values have enough values.
|
||||
config.set_num_filaments((unsigned int)filament_diameter->values.size());
|
||||
size_t n = 1;
|
||||
if (config.option("single_extruder_multi_material") == nullptr || config.opt_bool("single_extruder_multi_material")) {
|
||||
// BBS
|
||||
auto* filament_diameter = dynamic_cast<const ConfigOptionFloats*>(config.option("filament_diameter"));
|
||||
if (filament_diameter != nullptr) {
|
||||
n = filament_diameter->values.size();
|
||||
// Loaded the FFF Printer settings. Verify, that all extruder dependent values have enough values.
|
||||
config.set_num_filaments((unsigned int) n);
|
||||
}
|
||||
} else {
|
||||
auto* nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(config.option("nozzle_diameter"));
|
||||
if (nozzle_diameter != nullptr) {
|
||||
n = nozzle_diameter->values.size();
|
||||
// Loaded the FFF Printer settings. Verify, that all extruder dependent values have enough values.
|
||||
config.set_num_extruders((unsigned int) n);
|
||||
}
|
||||
}
|
||||
|
||||
if (config.option("filament_diameter") != nullptr) {
|
||||
// This config contains single or multiple filament presets.
|
||||
// Ensure that the filament preset vector options contain the correct number of values.
|
||||
// BBS
|
||||
size_t n = (filament_diameter == nullptr) ? 1 : filament_diameter->values.size();
|
||||
const auto &defaults = FullPrintConfig::defaults();
|
||||
for (const std::string &key : Preset::filament_options()) {
|
||||
if (key == "compatible_prints" || key == "compatible_printers")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue