juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-27 04:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: add nozzle type ntTungstenCarbide

Browse Source 
jira: [STUDIO-11597]
Change-Id: Ibec41549042d253aeb85ba81e93e7c26a4a56ed2
(cherry picked from commit 1352cff31427eadd2c85ce4c9602ab3379a5ae9e)
This commit is contained in:
xin.zhang
2025-04-16 14:16:53 +08:00
committed by Noisyfox
parent 285c237095
commit 472a48acc6
11 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6221,6 +6221,8 @@ void MachineObject::parse_new_info(json print)
nozzle_obj.nozzle_type = NozzleType::ntStainlessSteel;
} else if (type.substr(2, 2) == std::string("01")) {
nozzle_obj.nozzle_type = NozzleType::ntHardenedSteel;
} else if (type.substr(2, 2) == std::string("05")) {
nozzle_obj.nozzle_type = NozzleType::ntTungstenCarbide;
}
} else {
nozzle_obj.tool_type = NozzleToolType::NONE_TOOLTYPE;
@@ -6696,7 +6698,7 @@ bool DeviceManager::EnableMultiMachine = false;
bool DeviceManager::key_field_only = false;
std::vector<float> nozzle_diameter_list{ 0.2f,0.4f,0.6f,0.8f };
std::vector<std::string> nozzle_type_list{ "hardened_steel", "stainless_steel" };
std::vector<std::string> nozzle_type_list {"hardened_steel", "stainless_steel", "tungsten_carbide"};
DeviceManager::DeviceManager(NetworkAgent* agent)
{

2
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -188,7 +188,7 @@ struct Nozzle
int id;
NozzleToolType tool_type; // H nozzle or Cut
NozzleFlowType nozzle_flow; // 0-common 1-high flow
NozzleType nozzle_type; // 0-stainless_steel 1-hardened_steel
NozzleType nozzle_type; // 0-stainless_steel 1-hardened_steel 5-tungsten_carbide
float diameter = {0.4f}; // 0-0.2mm 1-0.4mm 2-0.6 mm3-0.8mm
int max_temp = 0;
int wear = 0;

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

@@ -792,6 +792,7 @@ wxString PrinterPartsDialog::GetString(NozzleType nozzle_type) const {
switch (nozzle_type) {
case Slic3r::ntHardenedSteel: return _L("Hardened Steel");
case Slic3r::ntStainlessSteel: return _L("Stainless Steel");
case Slic3r::ntTungstenCarbide: return _L("Tungsten Carbide");
default: break;
}

3
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -2308,6 +2308,9 @@ wxString SelectMachineDialog::format_steel_name(NozzleType type)
else if (type == NozzleType::ntStainlessSteel) {
return _L("Stainless Steel");
}
else if (type == NozzleType::ntTungstenCarbide) {
return _L("Tungsten Carbide");
}
return _L("Unknown");
}

11
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@@ -2088,17 +2088,6 @@ void SyncAmsInfoDialog::show_errors(wxString &info)
confirm_dlg.on_show();
}
wxString SyncAmsInfoDialog::format_steel_name(NozzleType type)
{
if (type == NozzleType::ntHardenedSteel) {
return _L("Hardened Steel");
} else if (type == NozzleType::ntStainlessSteel) {
return _L("Stainless Steel");
}
return wxEmptyString;
}
void SyncAmsInfoDialog::Enable_Auto_Refill(bool enable)
{
if (!m_ams_backup_tip) { return; }

1
src/slic3r/GUI/SyncAmsInfoDialog.hpp
View File

@@ -224,7 +224,6 @@ public:
std::string get_print_status_info(PrintDialogStatus status);
PrintFromType get_print_type() { return m_print_type; };
wxString format_steel_name(NozzleType type);
wxString format_text(wxString &m_msg);
PrintDialogStatus get_status() { return m_print_status; }
std::vector<std::string> sort_string(std::vector<std::string> strArray);