mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: When creating a custom Filament, use the system Filament type. 

Jira: 6301

Change-Id: I1bfddcf43d2ebaebca4eb494d1f64165c3d59e9e
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
This commit is contained in:
maosheng.wei 2024-04-08 10:04:56 +08:00 committed by Lane.Wei
parent c62d9b6674
commit 1938842ee2
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@ -45,16 +45,6 @@ static const std::vector<std::string> filament_types = {"PLA", "PLA+", "PLA
"PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc", "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc",
"TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber"}; "TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber"};
static const std::vector<std::string> system_filament_types = {"PLA", "ABS", "TPU", "PC", "ASA", "PA-CF", "PA6-CF", "PET-CF", "PETG", "PETG-CF", "PLA Aero", "PLA-CF", "PPA-CF", "PPA-GF", "PA", "HIPS", "PPS", "PPS-CF",
"PVA", "PE", "PP", "EVA", "PHA", "BVOH", "PE-CF", "PP-CF", "PP-GF"};
static std::unordered_map<std::string, std::string> system_filament_types_map =
{{"PLA", "PLA"}, {"ABS", "ABS"}, {"TPU", "TPU"}, {"PC", "PC"}, {"ASA", "ASA"}, {"PA-CF", "PA-CF"},
{"PA6-CF", "PA6-CF"}, {"PET-CF", "PET-CF"}, {"PETG", "PETG"}, {"PETG-CF", "PETG-CF"}, {"PLA Aero", "PLA-AERO"}, {"PLA-CF", "PLA-CF"},
{"PPA-CF", "PPA-CF"}, {"PPA-GF", "PPA-GF"}, {"PA", "PA"}, {"HIPS", "HIPS"}, {"PPS", "PPS"}, {"PPS-CF", "PPS-CF"},
{"PVA", "PVA"}, {"PE", "PE"}, {"PP", "PP"}, {"EVA", "EVA"}, {"PHA", "PHA"}, {"BVOH", "BVOH"},
{"PE-CF", "PE-CF"}, {"PP-CF", "PP-CF"}, {"PP-GF", "PP-GF"}};
static const std::vector<std::string> printer_vendors = {"Anycubic", "Artillery", "BIBO", "BIQU", "Creality ENDER", "Creality CR", "Creality SERMOON", static const std::vector<std::string> printer_vendors = {"Anycubic", "Artillery", "BIBO", "BIQU", "Creality ENDER", "Creality CR", "Creality SERMOON",
"FLSun", "gCreate", "Geeetech", "INAT", "Infinity3D", "Jubilee", "LNL3D", "FLSun", "gCreate", "Geeetech", "INAT", "Infinity3D", "Jubilee", "LNL3D",
"LulzBot", "MakerGear", "Original Prusa", "Papapiu", "Print4Taste", "RatRig", "Rigid3D", "LulzBot", "MakerGear", "Original Prusa", "Papapiu", "Print4Taste", "RatRig", "Rigid3D",
@ -558,6 +548,7 @@ CreateFilamentPresetDialog::CreateFilamentPresetDialog(wxWindow *parent)
{ {
m_create_type.base_filament = _L("Create Based on Current Filament"); m_create_type.base_filament = _L("Create Based on Current Filament");
m_create_type.base_filament_preset = _L("Copy Current Filament Preset "); m_create_type.base_filament_preset = _L("Copy Current Filament Preset ");
get_all_filament_presets();
this->SetBackgroundColour(*wxWHITE); this->SetBackgroundColour(*wxWHITE);
this->SetSize(wxSize(FromDIP(600), FromDIP(480))); this->SetSize(wxSize(FromDIP(600), FromDIP(480)));
@ -606,7 +597,6 @@ CreateFilamentPresetDialog::CreateFilamentPresetDialog(wxWindow *parent)
m_main_sizer->Add(m_scrolled_preset_panel, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10)); m_main_sizer->Add(m_scrolled_preset_panel, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10));
m_main_sizer->Add(create_button_item(), 0, wxEXPAND | wxALL, FromDIP(10)); m_main_sizer->Add(create_button_item(), 0, wxEXPAND | wxALL, FromDIP(10));
get_all_filament_presets();
get_all_visible_printer_name(); get_all_visible_printer_name();
select_curr_radiobox(m_create_type_btns, 0); select_curr_radiobox(m_create_type_btns, 0);
@ -759,7 +749,7 @@ wxBoxSizer *CreateFilamentPresetDialog::create_type_item()
horizontal_sizer->Add(optionSizer, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); horizontal_sizer->Add(optionSizer, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
wxArrayString filament_type; wxArrayString filament_type;
for (const wxString &filament : system_filament_types) { for (const wxString &filament : m_system_filament_types_set) {
filament_type.Add(filament); filament_type.Add(filament);
} }
@ -1016,7 +1006,7 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item()
return; return;
} }
std::string filament_preset_name = vendor_name + " " + type_name + " " + serial_name; std::string filament_preset_name = vendor_name + " " + (type_name == "PLA-AERO" ? "PLA Aero" : type_name) + " " + serial_name;
PresetBundle *preset_bundle = wxGetApp().preset_bundle; PresetBundle *preset_bundle = wxGetApp().preset_bundle;
if (preset_bundle->filaments.is_alias_exist(filament_preset_name)) { if (preset_bundle->filaments.is_alias_exist(filament_preset_name)) {
MessageDialog dlg(this, MessageDialog dlg(this,
@ -1132,7 +1122,7 @@ wxArrayString CreateFilamentPresetDialog::get_filament_preset_choices()
continue; continue;
} }
auto fila_type = preset->config.option<ConfigOptionStrings>("filament_type"); auto fila_type = preset->config.option<ConfigOptionStrings>("filament_type");
if (!fila_type || fila_type->values.empty() || system_filament_types_map[type_name] != fila_type->values[0]) continue; if (!fila_type || fila_type->values.empty() || type_name != fila_type->values[0]) continue;
m_filament_choice_map[preset->filament_id].push_back(preset); m_filament_choice_map[preset->filament_id].push_back(preset);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " base user preset is:" << preset->name; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " base user preset is:" << preset->name;
} }
@ -1282,7 +1272,7 @@ void CreateFilamentPresetDialog::get_filament_presets_by_machine()
if (filament_types && filament_types->values.empty()) continue; if (filament_types && filament_types->values.empty()) continue;
const std::string filament_type = filament_types->values[0]; const std::string filament_type = filament_types->values[0];
if (filament_type != system_filament_types_map[type_name]) { if (filament_type != type_name) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " preset type is not selected type and preset name is: " << preset->name; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " preset type is not selected type and preset name is: " << preset->name;
continue; continue;
} }
@ -1331,8 +1321,11 @@ void CreateFilamentPresetDialog::get_all_filament_presets()
const std::deque<Preset> &temp_filament_presets = preset_bundle->filaments.get_presets(); const std::deque<Preset> &temp_filament_presets = preset_bundle->filaments.get_presets();
for (const Preset& preset : temp_filament_presets) { for (const Preset& preset : temp_filament_presets) {
if (preset.filament_id.empty() || "null" == preset.filament_id) continue; if (preset.filament_id.empty() || "null" == preset.filament_id) continue;
std::string filament_preset_name = preset.name; auto filament_type = preset.config.option<ConfigOptionStrings>("filament_type");
if (filament_type && filament_type->values.size())
m_system_filament_types_set.insert(filament_type->values[0]);
if (!preset.is_visible) continue; if (!preset.is_visible) continue;
std::string filament_preset_name = preset.name;
Preset *filament_preset = new Preset(preset); Preset *filament_preset = new Preset(preset);
m_all_presets_map[filament_preset_name] = filament_preset; m_all_presets_map[filament_preset_name] = filament_preset;
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " loaded preset name is: " << filament_preset->name; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " loaded preset name is: " << filament_preset->name;
@ -4324,9 +4317,10 @@ EditFilamentPresetDialog::EditFilamentPresetDialog(wxWindow *parent, FilamentInf
if (vendor_names && !vendor_names->values.empty()) m_vendor_name = vendor_names->values[0]; if (vendor_names && !vendor_names->values.empty()) m_vendor_name = vendor_names->values[0];
auto filament_types = dynamic_cast<ConfigOptionStrings *>(preset->config.option("filament_type")); auto filament_types = dynamic_cast<ConfigOptionStrings *>(preset->config.option("filament_type"));
if (filament_types && !filament_types->values.empty()) m_filament_type = filament_types->values[0]; if (filament_types && !filament_types->values.empty()) m_filament_type = filament_types->values[0];
size_t index = m_filament_name.find(m_filament_type); std::string filament_type = m_filament_type == "PLA-AERO" ? "PLA Aero" : m_filament_type;
if (std::string::npos != index && index + m_filament_type.size() < m_filament_name.size()) { size_t index = m_filament_name.find(filament_type);
m_filament_serial = m_filament_name.substr(index + m_filament_type.size()); if (std::string::npos != index && index + filament_type.size() < m_filament_name.size()) {
m_filament_serial = m_filament_name.substr(index + filament_type.size());
if (m_filament_serial.size() > 2 && m_filament_serial[0] == ' ') { if (m_filament_serial.size() > 2 && m_filament_serial[0] == ' ') {
m_filament_serial = m_filament_serial.substr(1); m_filament_serial = m_filament_serial.substr(1);
} }
@ -4804,8 +4798,7 @@ void CreatePresetForPrinterDialog::get_visible_printer_and_compatible_filament_p
if (filament_types && filament_types->values.empty()) continue; if (filament_types && filament_types->values.empty()) continue;
const std::string filament_type = filament_types->values[0]; const std::string filament_type = filament_types->values[0];
std::string filament_type_ = system_filament_types_map[m_filament_type]; std::string filament_type_ = m_filament_type == "PLA Aero" ? "PLA-AERO" : m_filament_type;
if (filament_type_.empty()) filament_type_ = m_filament_type;
if (filament_type == filament_type_) { if (filament_type == filament_type_) {
m_printer_compatible_filament_presets[printer_preset.name].push_back(std::make_shared<Preset>(filament_preset)); m_printer_compatible_filament_presets[printer_preset.name].push_back(std::make_shared<Preset>(filament_preset));
} }

4
src/slic3r/GUI/CreatePresetsDialog.hpp
View File

@ -70,12 +70,13 @@ private:
std::unordered_map<std::string, std::vector<Preset *>> m_filament_choice_map; std::unordered_map<std::string, std::vector<Preset *>> m_filament_choice_map;
std::unordered_map<wxString, std::string> m_public_name_to_filament_id_map; std::unordered_map<wxString, std::string> m_public_name_to_filament_id_map;
std::unordered_map<std::string, Preset *> m_all_presets_map; std::unordered_map<std::string, Preset *> m_all_presets_map;
std::unordered_set<std::string> m_system_filament_types_set;
std::set<std::string> m_visible_printers; std::set<std::string> m_visible_printers;
CreateType m_create_type; CreateType m_create_type;
Button * m_button_create = nullptr; Button * m_button_create = nullptr;
Button * m_button_cancel = nullptr; Button * m_button_cancel = nullptr;
ComboBox * m_filament_vendor_combobox = nullptr; ComboBox * m_filament_vendor_combobox = nullptr;
::CheckBox * m_can_not_find_vendor_checkbox = nullptr; ::CheckBox * m_can_not_find_vendor_checkbox = nullptr;
ComboBox * m_filament_type_combobox = nullptr; ComboBox * m_filament_type_combobox = nullptr;
ComboBox * m_exist_vendor_combobox = nullptr; ComboBox * m_exist_vendor_combobox = nullptr;
ComboBox * m_filament_preset_combobox = nullptr; ComboBox * m_filament_preset_combobox = nullptr;
@ -316,7 +317,6 @@ private:
std::string m_filament_vendor; std::string m_filament_vendor;
std::string m_filament_type; std::string m_filament_type;
std::shared_ptr<PresetBundle> m_preset_bundle; std::shared_ptr<PresetBundle> m_preset_bundle;
std::string m_filamnt_type;
ComboBox * m_selected_printer = nullptr; ComboBox * m_selected_printer = nullptr;
ComboBox * m_selected_filament = nullptr; ComboBox * m_selected_filament = nullptr;
Button * m_ok_btn = nullptr; Button * m_ok_btn = nullptr;