diff --git a/src/libslic3r/ProjectTask.hpp b/src/libslic3r/ProjectTask.hpp index ac0bfe2182..63c5b2eabd 100644 --- a/src/libslic3r/ProjectTask.hpp +++ b/src/libslic3r/ProjectTask.hpp @@ -67,6 +67,20 @@ public: return -1; }; + + /*copied from AmsTray::get_display_filament_type()*/ + std::string get_display_filament_type() + { + if (type == "PLA-S") + return "Sup.PLA"; + else if (type == "PA-S") + return "Sup.PA"; + else if (type == "ABS-S") + return "Sup.ABS"; + else + return type; + return type; + } }; class BBLSliceInfo { diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 45692950d5..07f31acbea 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -4259,15 +4259,15 @@ void SelectMachineDialog::set_default_from_sdcard() auto nozzle_id = m_filaments_map[fo.id]; if (nozzle_id == 1) { - item = new MaterialItem(m_filament_left_panel, wxColour(fo.color), fo.type); + item = new MaterialItem(m_filament_left_panel, wxColour(fo.color), fo.get_display_filament_type()); m_sizer_ams_mapping_left->Add(item, 0, wxALL, FromDIP(5)); } else if (nozzle_id == 2) { - item = new MaterialItem(m_filament_right_panel, wxColour(fo.color), fo.type); + item = new MaterialItem(m_filament_right_panel, wxColour(fo.color), fo.get_display_filament_type()); m_sizer_ams_mapping_right->Add(item, 0, wxALL, FromDIP(5)); } } } else { - item = new MaterialItem(m_filament_panel, wxColour(fo.color), fo.type); + item = new MaterialItem(m_filament_panel, wxColour(fo.color), fo.get_display_filament_type()); m_sizer_ams_mapping->Add(item, 0, wxALL, FromDIP(5)); }