juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-20 02:43:02 +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

12
src/slic3r/Utils/CalibUtils.cpp
View File

@@ -107,9 +107,9 @@ static bool is_same_nozzle_diameters(const DynamicPrintConfig &full_config, cons
auto opt_nozzle_diameters = full_config.option<ConfigOptionFloats>("nozzle_diameter");
if (opt_nozzle_diameters != nullptr) {
float preset_nozzle_diameter = opt_nozzle_diameters->get_at(0);
if (preset_nozzle_diameter != obj->m_nozzle_data.nozzles[0].diameter) {
if (preset_nozzle_diameter != obj->m_extder_data.extders[0].diameter) {
wxString nozzle_in_preset = wxString::Format(_L("nozzle in preset: %s %s"), wxString::Format("%.1f", preset_nozzle_diameter).ToStdString(), to_wstring_name(nozzle_type));
wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj->m_nozzle_data.nozzles[0].diameter, DeviceManager::nozzle_type_conver(obj->m_nozzle_data.nozzles[0].diameter));
wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj->m_extder_data.extders[0].diameter, DeviceManager::nozzle_type_conver(obj->m_extder_data.extders[0].diameter));
error_msg = _L("Your nozzle diameter in preset is not consistent with memorized nozzle diameter. Did you change your nozzle lately?") + "\n " + nozzle_in_preset +
"\n " + nozzle_in_printer + "\n";
@@ -129,9 +129,9 @@ static bool is_same_nozzle_type(const DynamicPrintConfig &full_config, const Mac
NozzleType nozzle_type = NozzleType::ntUndefine;
if (obj->m_nozzle_data.nozzles[0].type == "stainless_steel") {
if (obj->m_extder_data.extders[0].type == "stainless_steel") {
nozzle_type = NozzleType::ntStainlessSteel;
} else if (obj->m_nozzle_data.nozzles[0].type == "hardened_steel") {
} else if (obj->m_extder_data.extders[0].type == "hardened_steel") {
nozzle_type = NozzleType::ntHardenedSteel;
}
@@ -141,7 +141,7 @@ static bool is_same_nozzle_type(const DynamicPrintConfig &full_config, const Mac
if (abs(filament_nozzle_hrc) > abs(printer_nozzle_hrc)) {
BOOST_LOG_TRIVIAL(info) << "filaments hardness mismatch: printer_nozzle_hrc = " << printer_nozzle_hrc << ", filament_nozzle_hrc = " << filament_nozzle_hrc;
std::string filament_type = full_config.opt_string("filament_type", 0);
error_msg = wxString::Format(_L("*Printing %s material with %s may cause nozzle damage"), filament_type, to_wstring_name(obj->m_nozzle_data.nozzles[0].type));
error_msg = wxString::Format(_L("*Printing %s material with %s may cause nozzle damage"), filament_type, to_wstring_name(obj->m_extder_data.extders[0].type));
error_msg += "\n";
MessageDialog msg_dlg(nullptr, error_msg, wxEmptyString, wxICON_WARNING | wxOK | wxCANCEL);
@@ -174,7 +174,7 @@ static bool check_nozzle_diameter_and_type(const DynamicPrintConfig &full_config
}
// P1P/S
if (obj->m_nozzle_data.nozzles[0].type.empty())
if (obj->m_extder_data.extders[0].type.empty())
return true;
if (!is_same_nozzle_diameters(full_config, obj, error_msg))