3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-05 06:17:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

48
src/libslic3r/PrintConfig.cpp
View file

@ -480,8 +480,8 @@ static const t_config_enum_values s_keys_map_ExtruderType = {
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(ExtruderType)
static const t_config_enum_values s_keys_map_NozzleVolumeType = {
{ "Normal", nvtNormal },
{ "Big Traffic", nvtBigTraffic }
{ "Standard", nvtStandard },
{ "High Flow", nvtHighFlow }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(NozzleVolumeType)
@ -4462,28 +4462,28 @@ void PrintConfigDef::init_fff_params()
def->label = L("Nozzle Volume Type");
def->tooltip = ("Nozzle volume type");
def->enum_keys_map = &ConfigOptionEnum<NozzleVolumeType>::get_enum_values();
def->enum_values.push_back("Normal");
def->enum_values.push_back("Big Traffic");
def->enum_labels.push_back(L("Normal"));
def->enum_labels.push_back(L("Big Traffic"));
def->enum_values.push_back(L("Standard"));
def->enum_values.push_back(L("High Flow"));
def->enum_labels.push_back(L("Standard"));
def->enum_labels.push_back(L("High Flow"));
def->mode = comSimple;
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtNormal });
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard });
def = this->add("default_nozzle_volume_type", coEnums);
def->label = L("Default Nozzle Volume Type");
def->tooltip = ("Default Nozzle volume type for extruders in this printer");
def->enum_keys_map = &ConfigOptionEnum<NozzleVolumeType>::get_enum_values();
def->enum_values.push_back("Normal");
def->enum_values.push_back("Big Traffic");
def->enum_labels.push_back(L("Normal"));
def->enum_labels.push_back(L("Big Traffic"));
def->enum_values.push_back(L("Standard"));
def->enum_values.push_back(L("High Flow"));
def->enum_labels.push_back(L("Standard"));
def->enum_labels.push_back(L("High Flow"));
def->mode = comDevelop;
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtNormal });
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard });
def = this->add("extruder_variant_list", coStrings);
def->label = "Extruder variant list";
def->tooltip = "Extruder variant list";
def->set_default_value(new ConfigOptionStrings { "Direct Drive Normal" });
def->set_default_value(new ConfigOptionStrings { "Direct Drive Standard" });
def->cli = ConfigOptionDef::nocli;
def = this->add("extruder_change_length", coFloats);
@ -4508,7 +4508,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("printer_extruder_variant", coStrings);
def->label = "Printer's extruder variant";
def->tooltip = "Printer's extruder variant";
def->set_default_value(new ConfigOptionStrings { "Direct Drive Normal" });
def->set_default_value(new ConfigOptionStrings { "Direct Drive Standard" });
def->cli = ConfigOptionDef::nocli;
def = this->add("master_extruder_id", coInt);
@ -4525,7 +4525,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("print_extruder_variant", coStrings);
def->label = "Print's extruder variant";
def->tooltip = "Print's extruder variant";
def->set_default_value(new ConfigOptionStrings { "Direct Drive Normal" });
def->set_default_value(new ConfigOptionStrings { "Direct Drive Standard" });
def->cli = ConfigOptionDef::nocli;
/*def = this->add("filament_extruder_id", coInts);
@ -4537,7 +4537,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("filament_extruder_variant", coStrings);
def->label = "Filament's extruder variant";
def->tooltip = "Filament's extruder variant";
def->set_default_value(new ConfigOptionStrings { "Direct Drive Normal" });
def->set_default_value(new ConfigOptionStrings { "Direct Drive Standard" });
def->cli = ConfigOptionDef::nocli;
def = this->add("filament_self_index", coInts);
@ -7079,9 +7079,14 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
} else {
opt_key = "wall_sequence";
}
}
else if (opt_key == "extruder_type" && value == "DirectDrive") {
value = "Direct Drive";
} else if (opt_key == "nozzle_volume_type"
|| opt_key == "default_nozzle_volume_type"
|| opt_key == "printer_extruder_variant"
|| opt_key == "print_extruder_variant"
|| opt_key == "filament_extruder_variant"
|| opt_key == "extruder_variant_list") {
ReplaceString(value, "Normal", "Standard");
ReplaceString(value, "Big Traffic", "High Flow");
}
else if(opt_key == "ensure_vertical_shell_thickness") {
if(value == "1") {
@ -8010,7 +8015,7 @@ void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig&
if (extruder_id > 0 && extruder_id <= extruder_count) {
variant_index.resize(1);
ExtruderType extruder_type = ExtruderType::etDirectDrive; // TODO:Orca hack (ExtruderType)(opt_extruder_type->get_at(extruder_id - 1));
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtNormal; // TODO:Orca hack (NozzleVolumeType)(opt_nozzle_volume_type->get_at(extruder_id - 1));
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtStandard; // TODO:Orca hack (NozzleVolumeType)(opt_nozzle_volume_type->get_at(extruder_id - 1));
//variant index
variant_index[0] = get_index_for_extruder(extruder_id, id_name, extruder_type, nozzle_volume_type, variant_name);
@ -8029,7 +8034,7 @@ void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig&
for (int e_index = 0; e_index < extruder_count; e_index++)
{
ExtruderType extruder_type = ExtruderType::etDirectDrive; // TODO:Orca hack (ExtruderType)(opt_extruder_type->get_at(e_index));
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtNormal; // (NozzleVolumeType)(opt_nozzle_volume_type->get_at(e_index));
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtStandard; // (NozzleVolumeType)(opt_nozzle_volume_type->get_at(e_index));
//variant index
variant_index[e_index] = get_index_for_extruder(e_index+1, id_name, extruder_type, nozzle_volume_type, variant_name);
@ -9623,3 +9628,4 @@ bool is_XL_printer(const PrintConfig &cfg)
#include <cereal/types/polymorphic.hpp>
CEREAL_REGISTER_TYPE(Slic3r::DynamicPrintConfig)
CEREAL_REGISTER_POLYMORPHIC_RELATION(Slic3r::DynamicConfig, Slic3r::DynamicPrintConfig)

6
src/libslic3r/PrintConfig.hpp
View file

@ -373,9 +373,9 @@ enum ExtruderType {
};
enum NozzleVolumeType {
nvtNormal = 0,
nvtBigTraffic,
nvtMaxNozzleVolumeType = nvtBigTraffic
nvtStandard = 0,
nvtHighFlow,
nvtMaxNozzleVolumeType = nvtHighFlow
};
enum FilamentMapMode {

2
src/libslic3r/calib.hpp
View file

@ -59,7 +59,7 @@ public:
int slot_id = 0;
int bed_temp;
ExtruderType extruder_type{ExtruderType::etDirectDrive};
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtNormal;
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtStandard;
int nozzle_temp;
float nozzle_diameter;
std::string filament_id;

2
src/slic3r/GUI/AMSMaterialsSetting.cpp
View file

@ -1133,7 +1133,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
};
int extruder_id = obj->get_extruder_id_by_ams_id(std::to_string(ams_id));
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtNormal;
NozzleVolumeType nozzle_volume_type = NozzleVolumeType::nvtStandard;
if (obj->m_extder_data.extders[extruder_id].current_nozzle_flow_type == NozzleFlowType::NONE_FLOWTYPE) {
MessageDialog dlg(nullptr, _L("There are unset nozzle types. Please set the nozzle types of all extruders before synchronizing."), _L("Warning"), wxICON_WARNING | wxOK);
dlg.ShowModal();

2
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -420,7 +420,7 @@ void CalibrationWizard::cache_preset_info(MachineObject* obj, float nozzle_dia)
}
else {
result.extruder_id = 0;
result.nozzle_volume_type = NozzleVolumeType::nvtNormal;
result.nozzle_volume_type = NozzleVolumeType::nvtStandard;
}
obj->selected_cali_preset.push_back(result);

6
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View file

@ -485,7 +485,7 @@ CalibrationPresetPage::CalibrationPresetPage(
m_cali_filament_mode = CalibrationFilamentMode::CALI_MODEL_SINGLE;
m_top_sizer = new wxBoxSizer(wxVERTICAL);
m_extrder_types.resize(2, ExtruderType::etDirectDrive);
m_extruder_nozzle_types.resize(2, NozzleVolumeType::nvtBigTraffic);
m_extruder_nozzle_types.resize(2, NozzleVolumeType::nvtHighFlow);
create_page(this);
@ -661,7 +661,7 @@ void CalibrationPresetPage::init_selection_values()
}
for (size_t i = 0; i < m_comboBox_nozzle_volume_types.size(); ++i) {
m_comboBox_nozzle_volume_types[i]->SetSelection(int(NozzleVolumeType::nvtNormal)); // default for single extruder printer
m_comboBox_nozzle_volume_types[i]->SetSelection(int(NozzleVolumeType::nvtStandard)); // default for single extruder printer
}
}
}
@ -742,7 +742,7 @@ NozzleVolumeType CalibrationPresetPage::get_nozzle_volume_type(int extruder_id)
if (m_comboBox_nozzle_volume_types.size() > extruder_id)
return NozzleVolumeType(m_comboBox_nozzle_volume_types[extruder_id]->GetSelection());
else {
return NozzleVolumeType::nvtNormal;
return NozzleVolumeType::nvtStandard;
}
}

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

4
src/slic3r/GUI/Plater.cpp
View file

@ -758,8 +758,8 @@ public:
void Sidebar::priv::sync_extruder_list()
{
auto printer_tab = dynamic_cast<TabPrinter *>(wxGetApp().get_tab(Preset::TYPE_PRINTER));
printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtBigTraffic);
printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtNormal);
printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtHighFlow);
printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtStandard);
MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
if (obj == nullptr) {
MessageDialog dlg(this->plater, _L("Please select a printer in 'Device' page first."), _L("Sync extruder infomation"), wxOK);

10
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1263,7 +1263,7 @@ bool SelectMachineDialog::can_hybrid_mapping(ExtderData data) {
for (auto it = data.extders.rbegin(); it != data.extders.rend(); it++){
//exist field is not updated, wait add
//if (it->exist < 3) return false;
std::string type_str = it->current_nozzle_flow_type ? "Big Traffic" : "Normal";
std::string type_str = it->current_nozzle_flow_type ? "High Flow" : "Standard";
flow_type_of_machine.push_back(type_str);
}
//get the nozzle type of preset --> flow_types
@ -1325,8 +1325,8 @@ bool SelectMachineDialog::is_nozzle_type_match(ExtderData data) {
for (auto i = 0; i < used_extruders.size(); i++) {
if (nozzle_volume_type_opt) {
NozzleVolumeType nozzle_volume_type = (NozzleVolumeType) (nozzle_volume_type_opt->get_at(used_extruders[i]));
if (nozzle_volume_type == NozzleVolumeType::nvtNormal) { used_extruders_flow[used_extruders[i]] = "Normal";}
else {used_extruders_flow[used_extruders[i]] = "Big Traffic";}
if (nozzle_volume_type == NozzleVolumeType::nvtStandard) { used_extruders_flow[used_extruders[i]] = "Standard";}
else {used_extruders_flow[used_extruders[i]] = "High Flow";}
}
}
@ -1337,9 +1337,9 @@ bool SelectMachineDialog::is_nozzle_type_match(ExtderData data) {
std::vector<std::string> flow_type_of_machine;
for (auto it = data.extders.begin(); it != data.extders.end(); it++) {
if (it->current_nozzle_flow_type == NozzleFlowType::H_FLOW) {
flow_type_of_machine.push_back("Big Traffic");
flow_type_of_machine.push_back("High Flow");
} else if (it->current_nozzle_flow_type == NozzleFlowType::S_FLOW){
flow_type_of_machine.push_back("Normal");
flow_type_of_machine.push_back("Standard");
}
}

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

@ -61,10 +61,10 @@ void get_default_k_n_value(const std::string &filament_id, float &k, float &n)
wxString get_nozzle_volume_type_name(NozzleVolumeType type)
{
if (NozzleVolumeType::nvtNormal == type) {
return _L("Normal");
} else if (NozzleVolumeType::nvtBigTraffic == type) {
return _L("BigTraffic");
if (NozzleVolumeType::nvtStandard == type) {
return _L("Standard");
} else if (NozzleVolumeType::nvtHighFlow == type) {
return _L("High Flow");
}
return wxString();
}