Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix extruder number issue when SEMM is not enabled #8027

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −10
Open

Fix extruder number issue when SEMM is not enabled #8027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b99bd8
Revert ac80575b28901a46468920cf1707213de4c86d22
Noisyfox Jan 13, 2025
dccc504
Fix issue that extruder number is not initialized properly when SEMM …
Noisyfox Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/libslic3r/Preset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 2 additions & 3 deletions src/slic3r/GUI/Tab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5118,13 +5118,12 @@ bool Tab::select_preset(std::string preset_name, bool delete_current /*=false*/,
apply_config_from_cache();

// Orca: update presets for the selected printer
load_current_preset();

if (m_type == Preset::TYPE_PRINTER && wxGetApp().app_config->get_bool("remember_printer_config")) {
m_preset_bundle->update_selections(*wxGetApp().app_config);
wxGetApp().plater()->sidebar().on_filaments_change(m_preset_bundle->filament_presets.size());
}

load_current_preset();


if (delete_third_printer) {
wxGetApp().CallAfter([filament_presets, process_presets]() {
Expand Down
Loading