diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 5b62c8aa6..a837639f4 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -2853,6 +2853,12 @@ void PartPlate::set_filament_maps(const std::vector& f_maps) filament_maps = f_maps; } +void PartPlate::on_extruder_count_changed(int extruder_count) +{ + std::vector& filament_maps = m_config.option("filament_map", true)->values; + std::fill(filament_maps.begin(), filament_maps.end(), 1); +} + void PartPlate::set_filament_count(int filament_count) { std::vector& filament_maps = m_config.option("filament_map", true)->values; @@ -2865,7 +2871,6 @@ void PartPlate::on_filament_added() filament_maps.push_back(1); } - void PartPlate::on_filament_deleted(int filament_count, int filament_id) { std::vector& filament_maps = m_config.option("filament_map", true)->values; @@ -5911,6 +5916,14 @@ void PartPlateList::load_cali_textures() PartPlateList::is_load_cali_texture = true; } +void PartPlateList::on_extruder_count_changed(int extruder_count) +{ + for (unsigned int i = 0; i < (unsigned int) m_plate_list.size(); ++i) { + m_plate_list[i]->on_extruder_count_changed(extruder_count); + } + BOOST_LOG_TRIVIAL(info) << boost::format("%1%: extruder_count=%2%")% __FUNCTION__ %extruder_count; +} + void PartPlateList::set_filament_count(int filament_count) { m_filament_count = filament_count; diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp index 15d2a1d91..f407d52d8 100644 --- a/src/slic3r/GUI/PartPlate.hpp +++ b/src/slic3r/GUI/PartPlate.hpp @@ -482,6 +482,7 @@ public: std::vector get_filament_maps(); void set_filament_maps(const std::vector& f_maps); + void on_extruder_count_changed(int extruder_count); void set_filament_count(int filament_count); void on_filament_added(); void on_filament_deleted(int filament_count, int filament_id); @@ -914,6 +915,8 @@ public: void init_cali_texture_info(); void load_cali_textures(); + void on_extruder_count_changed(int extruder_count); + void set_filament_count(int filament_count); void on_filament_deleted(int filament_count, int filament_id); void on_filament_added(int filament_count); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 2dd5c55e9..8c29f0bc3 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3816,6 +3816,8 @@ void TabPrinter::extruders_count_changed(size_t extruders_count) m_preset_bundle->printers.get_edited_preset().set_num_extruders(extruders_count); m_preset_bundle->update_multi_material_filament_presets(); is_count_changed = true; + + wxGetApp().plater()->get_partplate_list().on_extruder_count_changed((int)m_extruders_count); } // BBS #if 1