3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-23 21:05:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: modify the name of high flow

Browse source 
jira: none
Change-Id: Icd1a0ac91e957fc38a6f072b1bb3af0c97be398e
(cherry picked from commit ea0691f092755d7e68db3ecf8b46b0e86a8fadb2)
This commit is contained in:
zhimin.zeng 2024-11-14 19:11:29 +08:00 • committed by Noisyfox
parent 3297fe658e
commit 37ff918ea9
10 changed files with 54 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/DeviceManager.cpp
View file

@ -208,11 +208,11 @@ wxString generate_nozzle_id(NozzleVolumeType nozzle_type, const std::string& dia
// HS00-0.4
std::string nozzle_id = "H";
switch (nozzle_type) {
case NozzleVolumeType::nvtNormal: {
case NozzleVolumeType::nvtStandard: {
nozzle_id += "S";
break;
}
case NozzleVolumeType::nvtBigTraffic: {
case NozzleVolumeType::nvtHighFlow: {
nozzle_id += "H";
break;
}
@ -230,13 +230,13 @@ NozzleVolumeType convert_to_nozzle_type(const std::string &str)
{
if (str.size() < 8) {
assert(false);
return NozzleVolumeType::nvtNormal;
return NozzleVolumeType::nvtStandard;
}
NozzleVolumeType res = NozzleVolumeType::nvtNormal;
NozzleVolumeType res = NozzleVolumeType::nvtStandard;
if (str[1] == 'S')
res = NozzleVolumeType::nvtNormal;
res = NozzleVolumeType::nvtStandard;
else if (str[1] == 'H')
res = NozzleVolumeType::nvtBigTraffic;
res = NozzleVolumeType::nvtHighFlow;
return res;
}
@ -4916,7 +4916,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (it->contains("nozzle_id")) {
pa_calib_result.nozzle_volume_type = convert_to_nozzle_type((*it)["nozzle_id"].get<std::string>());
} else {
pa_calib_result.nozzle_volume_type = NozzleVolumeType::nvtNormal;
pa_calib_result.nozzle_volume_type = NozzleVolumeType::nvtStandard;
}
if ((*it)["k_value"].is_number_float())