Skip to content

feat: make filament Serial field optional in CreatePresetsDialog #10873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenJule wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −15
Open

feat: make filament Serial field optional in CreatePresetsDialog #10873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d1723a
feat: make filament Serial field optional (#14)
BenJule May 22, 2026
ae7ea01
fix: warn user when Serial input is invalid/sanitized to empty
BenJule May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions src/slic3r/GUI/CreatePresetsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ wxBoxSizer *CreateFilamentPresetDialog::create_serial_item()
wxBoxSizer *horizontal_sizer = new wxBoxSizer(wxHORIZONTAL);

wxBoxSizer * optionSizer = new wxBoxSizer(wxVERTICAL);
wxStaticText *static_serial_text = new wxStaticText(this, wxID_ANY, _L("Serial"), wxDefaultPosition, wxDefaultSize);
wxStaticText *static_serial_text = new wxStaticText(this, wxID_ANY, _L("Serial (optional)"), wxDefaultPosition, wxDefaultSize);
optionSizer->Add(static_serial_text, 0, wxEXPAND | wxALL, 0);
optionSizer->SetMinSize(OPTION_SIZE);
horizontal_sizer->Add(optionSizer, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
Expand Down Expand Up @@ -1018,28 +1018,26 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item()
}
//get filament serial
wxString serial_str = m_filament_serial_input->GetTextCtrl()->GetValue();
std::string serial_name;
if (serial_str.empty()) {
MessageDialog dlg(this, _L("Filament serial is not inputed, please input serial."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
wxYES | wxYES_DEFAULT | wxCENTRE);
dlg.ShowModal();
return;
} else {
serial_name = into_u8(serial_str);
}
std::string serial_name = into_u8(serial_str);
vendor_name = remove_special_key(vendor_name);
serial_name = remove_special_key(serial_name);

if (vendor_name.empty() || serial_name.empty()) {
MessageDialog dlg(this, _L("There may be escape characters in the vendor or serial input of filament. Please delete and re-enter."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
if (vendor_name.empty()) {
MessageDialog dlg(this, _L("The filament vendor name contains invalid characters. Please remove them and try again."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
wxYES | wxYES_DEFAULT | wxCENTRE);
dlg.ShowModal();
return;
}
boost::algorithm::trim(vendor_name);
boost::algorithm::trim(serial_name);
if (vendor_name.empty() || serial_name.empty()) {
MessageDialog dlg(this, _L("All inputs in the custom vendor or serial are spaces. Please re-enter."),
if (!serial_str.IsEmpty() && serial_name.empty()) {
MessageDialog dlg(this, _L("The filament serial contains only invalid characters or spaces. Please correct it or leave it blank."),
wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES | wxYES_DEFAULT | wxCENTRE);
dlg.ShowModal();
return;
}
if (vendor_name.empty()) {
MessageDialog dlg(this, _L("The filament vendor name cannot be blank. Please enter a vendor name."),
wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES | wxYES_DEFAULT | wxCENTRE);
dlg.ShowModal();
return;
Expand All @@ -1058,7 +1056,8 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item()
return;
}

std::string filament_preset_name = vendor_name + " " + (type_name == "PLA-AERO" ? "PLA Aero" : type_name) + " " + serial_name;
std::string display_type = type_name == "PLA-AERO" ? "PLA Aero" : type_name;
std::string filament_preset_name = vendor_name + " " + display_type + (serial_name.empty() ? "" : " " + serial_name);
PresetBundle *preset_bundle = wxGetApp().preset_bundle;
if (preset_bundle->filaments.is_alias_exist(filament_preset_name)) {
MessageDialog dlg(this,
Expand Down