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

ENH:FilamentMapDialog add filament type

Browse Source 
jira: nojira
Change-Id: I08a3c037ffa6227602e71b97697a1bc61e3d5050
(cherry picked from commit 6621fd0e20bce4c32788a86a6fde018f3a7f41ef)
This commit is contained in:
Mack
2025-02-18 22:03:25 +08:00
committed by Noisyfox
parent fc76b50234
commit 3dd369ad4e
8 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14892,9 +14892,12 @@ void Plater::on_bed_type_change(BedType bed_type)
bool Plater::update_filament_colors_in_full_config()
{
DynamicPrintConfig& project_config = wxGetApp().preset_bundle->project_config;
const auto& full_config = wxGetApp().preset_bundle->full_config();
ConfigOptionStrings* color_opt = project_config.option<ConfigOptionStrings>("filament_colour");
const ConfigOptionStrings* type_opt = full_config.option<ConfigOptionStrings>("filament_type");
p->config->option<ConfigOptionStrings>("filament_colour")->values = color_opt->values;
p->config->option<ConfigOptionStrings>("filament_type")->values = type_opt->values;
return true;
}
@@ -16087,6 +16090,7 @@ void Plater::open_filament_map_setting_dialog(wxCommandEvent &evt)
const auto& project_config = wxGetApp().preset_bundle->project_config;
auto filament_colors = config()->option<ConfigOptionStrings>("filament_colour")->values;
auto filament_types = config()->option<ConfigOptionStrings>("filament_type")->values;
auto plate_filament_maps = curr_plate->get_real_filament_maps(project_config);
auto plate_filament_map_mode = curr_plate->get_filament_map_mode();
@@ -16095,6 +16099,7 @@ void Plater::open_filament_map_setting_dialog(wxCommandEvent &evt)
FilamentMapDialog filament_dlg(this,
filament_colors,
filament_types,
plate_filament_maps,
curr_plate->get_extruders(true),
plate_filament_map_mode,