juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update naming

Browse Source
This commit is contained in:
Noisyfox
2025-05-07 16:19:24 +08:00
parent 2ee934a7ee
commit 108a5b8344
11 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@@ -545,7 +545,7 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
else {
PACalibIndexInfo select_index_info;
select_index_info.tray_id = slot_id;
select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
select_index_info.cali_idx = -1;
select_index_info.filament_id = selected_ams_id;
CalibUtils::select_PA_calib_result(select_index_info);
@@ -676,7 +676,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
if (obj->cali_version >= 0) {
PACalibIndexInfo select_index_info;
select_index_info.tray_id = vt_tray;
select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
auto cali_select_id = m_comboBox_cali_result->GetSelection();
if (m_pa_profile_items.size() > 0 && cali_select_id >= 0) {
@@ -715,7 +715,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
if (obj->cali_version >= 0) {
PACalibIndexInfo select_index_info;
select_index_info.tray_id = cali_tray_id;
select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
auto cali_select_id = m_comboBox_cali_result->GetSelection();
if (m_pa_profile_items.size() > 0 && cali_select_id > 0) {
@@ -878,7 +878,7 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
std::set<std::string> filament_id_set;
PresetBundle * preset_bundle = wxGetApp().preset_bundle;
std::ostringstream stream;
stream << std::fixed << std::setprecision(1) << obj->m_nozzle_data.nozzles[0].diameter;
stream << std::fixed << std::setprecision(1) << obj->m_extder_data.extders[0].diameter;
std::string nozzle_diameter_str = stream.str();
std::set<std::string> printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle(MachineObject::get_preset_printer_model_name(obj->printer_type), nozzle_diameter_str);
@@ -1044,7 +1044,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
if (preset_bundle) {
std::ostringstream stream;
if (obj)
stream << std::fixed << std::setprecision(1) << obj->m_nozzle_data.nozzles[0].diameter;
stream << std::fixed << std::setprecision(1) << obj->m_extder_data.extders[0].diameter;
std::string nozzle_diameter_str = stream.str();
std::set<std::string> printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle(MachineObject::get_preset_printer_model_name(obj->printer_type),
nozzle_diameter_str);