3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-10 21:37:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

3
resources/info/nozzle_info.json
View file

@ -1,8 +1,9 @@
{
"version": "1.0.0.1",
"version": "1.0.0.2",
"nozzle_hrc": {
"hardened_steel": 55,
"stainless_steel": 20,
"tungsten_carbide", 85,
"brass": 2,
"undefine": 0
}

1
src/libslic3r/Print.cpp
View file

@ -2698,6 +2698,7 @@ int Print::get_hrc_by_nozzle_type(const NozzleType&type)
nozzle_type_to_hrc = {
{"hardened_steel",55},
{"stainless_steel",20},
{"tungsten_carbide", 85},
{"brass",2},
{"undefine",0}
};

5
src/libslic3r/PrintConfig.cpp
View file

@ -421,7 +421,8 @@ CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(LayerSeq)
static t_config_enum_values s_keys_map_NozzleType {
{ "undefine", int(NozzleType::ntUndefine) },
{ "hardened_steel", int(NozzleType::ntHardenedSteel) },
{ "stainless_steel",int(NozzleType::ntStainlessSteel) },
{ "stainless_steel", int(NozzleType::ntStainlessSteel)},
{ "tungsten_carbide", int(NozzleType::ntTungstenCarbide)},
{ "brass", int(NozzleType::ntBrass) }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(NozzleType)
@ -3198,10 +3199,12 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("undefine");
def->enum_values.push_back("hardened_steel");
def->enum_values.push_back("stainless_steel");
def->enum_values.push_back("tungsten_carbide");
def->enum_values.push_back("brass");
def->enum_labels.push_back(L("Undefine"));
def->enum_labels.push_back(L("Hardened steel"));
def->enum_labels.push_back(L("Stainless steel"));
def->enum_labels.push_back(L("Tungsten carbide"));
def->enum_labels.push_back(L("Brass"));
def->mode = comAdvanced;
def->nullable = true;

3
src/libslic3r/PrintConfig.hpp
View file

@ -314,6 +314,7 @@ enum NozzleType {
ntUndefine = 0,
ntHardenedSteel,
ntStainlessSteel,
ntTungstenCarbide,
ntBrass,
ntCount
};
@ -322,6 +323,7 @@ static std::unordered_map<NozzleType, std::string>NozzleTypeEumnToStr = {
{NozzleType::ntUndefine, "undefine"},
{NozzleType::ntHardenedSteel, "hardened_steel"},
{NozzleType::ntStainlessSteel, "stainless_steel"},
{NozzleType::ntTungstenCarbide, "tungsten_carbide"},
{NozzleType::ntBrass, "brass"}
};
@ -329,6 +331,7 @@ static std::unordered_map<std::string, NozzleType>NozzleTypeStrToEumn = {
{"undefine", NozzleType::ntUndefine},
{"hardened_steel", NozzleType::ntHardenedSteel},
{"stainless_steel", NozzleType::ntStainlessSteel},
{"tungsten_carbide", NozzleType::ntTungstenCarbide},
{"brass", NozzleType::ntBrass}
};

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);

2
src/slic3r/Utils/CalibUtils.cpp
View file

@ -133,6 +133,8 @@ static wxString to_wstring_name(std::string name)
return _L("Hardened Steel");
} else if (name == "stainless_steel") {
return _L("Stainless Steel");
} else if (name == "tungsten_carbide") {
return _L("Tungsten Carbide");
}
return wxEmptyString;