juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-15 09:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/bbl-network-upd

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Widgets/AMSControl.cpp
This commit is contained in:
Noisyfox
2025-05-11 21:17:43 +08:00
parent 4d25037614 a008014ab0
commit 3f60a23718
42 changed files with 354 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/PrintOptionsDialog.cpp
View File

@@ -535,7 +535,7 @@ void PrinterPartsDialog::set_nozzle_type(wxCommandEvent& evt)
nozzle_diameter_checkbox->Clear();
for (int i = 0; i < diameter_list.size(); i++)
{
nozzle_diameter_checkbox->Append(wxString::Format(_L("%.1f"), diameter_list[i]));
nozzle_diameter_checkbox->Append(wxString::Format("%.1f", diameter_list[i]));
}
nozzle_diameter_checkbox->SetSelection(0);
@@ -618,7 +618,7 @@ bool PrinterPartsDialog::Show(bool show)
for (int i = 0; i < diameter_list.size(); i++)
{
nozzle_diameter_checkbox->Append( wxString::Format(_L("%.1f"), diameter_list[i]));
nozzle_diameter_checkbox->Append( wxString::Format("%.1f", diameter_list[i]));
if (diameter_list[i] == diameter) {
nozzle_diameter_checkbox->SetSelection(i);
}