viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

FIX: wrong filament map in plate params

Browse Source 
1.Always clear filament map when global map mode change if
plate filament map mode is default

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I38055b7c77668fdb211f6b459be1044d8d3c8f8c
(cherry picked from commit b492ab13a28b25599da9668d84447be260cbbc34)
(cherry picked from commit 48c45e06a571decf9cfe460cd680bfad75ace3fe)
This commit is contained in:
xun.zhang
2024-12-26 20:40:57 +08:00
committed by Noisyfox
parent 439761f71e
commit c0cda458e5
5 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/slic3r/GUI/Plater.cpp
View File

@@ -14561,6 +14561,17 @@ FilamentMapMode Plater::get_global_filament_map_mode() const
return project_config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode")->value;
}
void Plater::on_filament_map_mode_change()
{
auto& plate_list = this->get_partplate_list();
int plate_count = plate_list.get_plate_count();
for (int idx = 0; idx < plate_count; ++idx) {
auto plate=plate_list.get_plate(idx);
auto plate_map_mode = plate->get_filament_map_mode();
if (plate_map_mode == fmmDefault)
plate->clear_filament_map();
}
}
wxWindow* Plater::get_select_machine_dialog()
{
@@ -15374,14 +15385,18 @@ void Plater::open_filament_map_setting_dialog(wxCommandEvent &evt)
bool need_invalidate = (old_map_mode != new_map_mode ||
old_filament_maps != new_filament_maps);
if (old_map_mode != new_map_mode)
if (old_map_mode != new_map_mode) {
curr_plate->set_filament_map_mode(new_map_mode);
curr_plate->clear_filament_map();
}
if (old_filament_maps != new_filament_maps && new_map_mode==fmmManual)
curr_plate->set_filament_maps(new_filament_maps);
if (new_map_mode == fmmDefault)
curr_plate->clear_filament_map_info();
if (new_map_mode == fmmDefault) {
curr_plate->clear_filament_map();
curr_plate->clear_filament_map_mode();
}
if (need_invalidate) {
if (need_slice) {