GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 05:31:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: [STUDIO-3037] use plate type labels from configdef

Browse Source 
Change-Id: Iecf81fe5a8cbe35ffa431432ff938a4b81ddea5c
This commit is contained in:
chunmao.guo 2023-05-31 15:37:02 +08:00 committed by Lane.Wei
parent 0bc2e5b886
commit 1a36608d59
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/PrintConfig.cpp
View File

@ -594,7 +594,7 @@ void PrintConfigDef::init_fff_params()
def->enum_values.emplace_back("Engineering Plate"); def->enum_values.emplace_back("Engineering Plate");
def->enum_values.emplace_back("High Temp Plate"); def->enum_values.emplace_back("High Temp Plate");
def->enum_values.emplace_back("Textured PEI Plate"); def->enum_values.emplace_back("Textured PEI Plate");
def->enum_labels.emplace_back(L("Cool Plate")); def->enum_labels.emplace_back(L("Cool Plate / PLA Plate"));
def->enum_labels.emplace_back(L("Engineering Plate")); def->enum_labels.emplace_back(L("Engineering Plate"));
def->enum_labels.emplace_back(L("High Temp Plate")); def->enum_labels.emplace_back(L("High Temp Plate"));
def->enum_labels.emplace_back(L("Textured PEI Plate")); def->enum_labels.emplace_back(L("Textured PEI Plate"));

16
src/slic3r/GUI/PlateSettingsDialog.cpp
View File

@ -129,17 +129,11 @@ void PlateSettingsDialog::sync_print_seq(int print_seq)
wxString PlateSettingsDialog::to_bed_type_name(BedType bed_type) { wxString PlateSettingsDialog::to_bed_type_name(BedType bed_type) {
switch (bed_type) { switch (bed_type) {
case btDefault: case btDefault:
return _L("Same as Global Bed Type"); return _L("Same as Global Plate Type");
case btPC: default: {
return _L("Cool Plate") + " / " + _L("PLA Plate"); const ConfigOptionDef *bed_type_def = print_config_def.get("curr_bed_type");
case btEP: return _(bed_type_def->enum_labels[size_t(bed_type) - 1]);
return _L("Engineering Plate"); }
case btPEI:
return _L("High Temp Plate");
case btPTE:
return _L("Textured PEI Plate");
default:
return _L("Same as Global Bed Type");
} }
return _L("Same as Global Bed Type"); return _L("Same as Global Bed Type");
} }

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

@ -622,11 +622,8 @@ Sidebar::Sidebar(Plater *parent)
m_bed_type_list = new ComboBox(p->m_panel_printer_content, wxID_ANY, wxString(""), wxDefaultPosition, {-1, FromDIP(30)}, 0, nullptr, wxCB_READONLY); m_bed_type_list = new ComboBox(p->m_panel_printer_content, wxID_ANY, wxString(""), wxDefaultPosition, {-1, FromDIP(30)}, 0, nullptr, wxCB_READONLY);
const ConfigOptionDef* bed_type_def = print_config_def.get("curr_bed_type"); const ConfigOptionDef* bed_type_def = print_config_def.get("curr_bed_type");
if (bed_type_def && bed_type_def->enum_keys_map) { if (bed_type_def && bed_type_def->enum_keys_map) {
for (auto item : *bed_type_def->enum_keys_map) { for (auto item : bed_type_def->enum_labels) {
if (item.first == "Default Plate") m_bed_type_list->AppendString(_L(item));
continue;
m_bed_type_list->AppendString(_L(item.first));
} }
} }