juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 03:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: update the filament name

Browse Source 
jira: [STUDIO-10348]
Change-Id: Id2762188eaf84ad7534a3d6063e0df8c000dd817
(cherry picked from commit d30ca5baa0f8caab10d4702347907e9fe5274eb2)
This commit is contained in:
xin.zhang
2025-02-13 09:16:16 +08:00
committed by Noisyfox
parent 686825b584
commit b8220bb81f
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libslic3r/ProjectTask.hpp
View File

@@ -67,6 +67,20 @@ public:
return -1; 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 { class BBLSliceInfo {

6
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -4259,15 +4259,15 @@ void SelectMachineDialog::set_default_from_sdcard()
auto nozzle_id = m_filaments_map[fo.id]; auto nozzle_id = m_filaments_map[fo.id];
if (nozzle_id == 1) { 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)); m_sizer_ams_mapping_left->Add(item, 0, wxALL, FromDIP(5));
} else if (nozzle_id == 2) { } 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)); m_sizer_ams_mapping_right->Add(item, 0, wxALL, FromDIP(5));
} }
} }
} else { } 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)); m_sizer_ams_mapping->Add(item, 0, wxALL, FromDIP(5));
} }