juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: flush_volume support multi_extruder and fix bug

Browse Source 
Change-Id: Id6b041f71ee6e55e68a6937f24ce791caac8e708
(cherry picked from commit 6fbad9ed33b2868a2fffbebdc3a98926431a1093)
This commit is contained in:
zhimin.zeng
2024-06-17 20:34:18 +08:00
committed by Noisyfox
parent 57916c7452
commit 84dc2d8835
13 changed files with 612 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libslic3r/PrintConfig.cpp
View File

@@ -472,7 +472,7 @@ static const t_config_enum_values s_keys_map_WipeTowerWallType{
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(WipeTowerWallType)
static const t_config_enum_values s_keys_map_ExtruderType = {
{ "Direct Drive", etDirectDrive },
{ "Direct drive", etDirectDrive },
{ "Bowden", etBowden }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(ExtruderType)
@@ -501,6 +501,7 @@ std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolume
variant_string = s_keys_names_ExtruderType[extruder_type];
variant_string+= " ";
variant_string+= s_keys_names_NozzleVolumeType[nozzle_volume_type];
return variant_string;
}
static void assign_printer_technology_to_unknown(t_optiondef_map &options, PrinterTechnology printer_technology)
@@ -5721,11 +5722,11 @@ void PrintConfigDef::init_fff_params()
280.f, 280.f, 0.f, 280.f,
280.f, 280.f, 280.f, 0.f });
def = this->add("flush_multiplier", coFloat);
def = this->add("flush_multiplier", coFloats);
def->label = L("Flush multiplier");
def->tooltip = L("The actual flushing volumes is equal to the flush multiplier multiplied by the flushing volumes in the table.");
//def->sidetext = "";
def->set_default_value(new ConfigOptionFloat(0.3));
def->sidetext = "";
def->set_default_value(new ConfigOptionFloats{0.3});
// BBS
def = this->add("prime_volume", coFloat);
@@ -7513,8 +7514,8 @@ int DynamicPrintConfig::get_index_for_extruder(int extruder_id, std::string id_n
auto variant_opt = dynamic_cast<const ConfigOptionStrings*>(this->option(variant_name));
auto id_opt = dynamic_cast<const ConfigOptionInts*>(this->option(id_name));
if ((variant_opt != nullptr)&&(id_opt != nullptr)) {
int v_size = variant_opt->size();
int i_size = variant_opt->size();
int v_size = variant_opt->values.size();
int i_size = id_opt->values.size();
std::string extruder_variant = get_extruder_variant_string(extruder_type, nozzle_volume_type);
for (int index = 0; index < v_size; index++)
{