Implemented "Use unlimited skirt" option
This commit is contained in:
parent
3d3e36ba8d
commit
7fd9c736b3
5 changed files with 13 additions and 2 deletions
src
|
@ -162,6 +162,7 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
|
||||||
} else if (
|
} else if (
|
||||||
opt_key == "skirts"
|
opt_key == "skirts"
|
||||||
|| opt_key == "skirt_height"
|
|| opt_key == "skirt_height"
|
||||||
|
|| opt_key == "infinit_skirt"
|
||||||
|| opt_key == "skirt_distance"
|
|| opt_key == "skirt_distance"
|
||||||
|| opt_key == "min_skirt_length"
|
|| opt_key == "min_skirt_length"
|
||||||
|| opt_key == "ooze_prevention"
|
|| opt_key == "ooze_prevention"
|
||||||
|
@ -1147,7 +1148,8 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
|
||||||
|
|
||||||
bool Print::has_infinite_skirt() const
|
bool Print::has_infinite_skirt() const
|
||||||
{
|
{
|
||||||
return (m_config.skirt_height == -1 && m_config.skirts > 0)
|
// return (m_config.skirt_height == -1 && m_config.skirts > 0)
|
||||||
|
return (m_config.infinit_skirt && m_config.skirts > 0)
|
||||||
|| (m_config.ooze_prevention && this->extruders().size() > 1);
|
|| (m_config.ooze_prevention && this->extruders().size() > 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1698,6 +1698,12 @@ void PrintConfigDef::init_fff_params()
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionInt(1));
|
def->set_default_value(new ConfigOptionInt(1));
|
||||||
|
|
||||||
|
def = this->add("infinit_skirt", coBool);
|
||||||
|
def->label = L("Use unlimit skirt");
|
||||||
|
def->tooltip = L("If enabled, the skirt will be as tall as a highest printed object.");
|
||||||
|
def->mode = comAdvanced;
|
||||||
|
def->set_default_value(new ConfigOptionBool(false));
|
||||||
|
|
||||||
def = this->add("skirts", coInt);
|
def = this->add("skirts", coInt);
|
||||||
def->label = L("Loops (minimum)");
|
def->label = L("Loops (minimum)");
|
||||||
def->full_label = L("Skirt Loops");
|
def->full_label = L("Skirt Loops");
|
||||||
|
|
|
@ -802,6 +802,7 @@ public:
|
||||||
ConfigOptionBools retract_layer_change;
|
ConfigOptionBools retract_layer_change;
|
||||||
ConfigOptionFloat skirt_distance;
|
ConfigOptionFloat skirt_distance;
|
||||||
ConfigOptionInt skirt_height;
|
ConfigOptionInt skirt_height;
|
||||||
|
ConfigOptionBool infinit_skirt;
|
||||||
ConfigOptionInt skirts;
|
ConfigOptionInt skirts;
|
||||||
ConfigOptionInts slowdown_below_layer_time;
|
ConfigOptionInts slowdown_below_layer_time;
|
||||||
ConfigOptionBool spiral_vase;
|
ConfigOptionBool spiral_vase;
|
||||||
|
@ -874,6 +875,7 @@ protected:
|
||||||
OPT_PTR(retract_layer_change);
|
OPT_PTR(retract_layer_change);
|
||||||
OPT_PTR(skirt_distance);
|
OPT_PTR(skirt_distance);
|
||||||
OPT_PTR(skirt_height);
|
OPT_PTR(skirt_height);
|
||||||
|
OPT_PTR(infinit_skirt);
|
||||||
OPT_PTR(skirts);
|
OPT_PTR(skirts);
|
||||||
OPT_PTR(slowdown_below_layer_time);
|
OPT_PTR(slowdown_below_layer_time);
|
||||||
OPT_PTR(spiral_vase);
|
OPT_PTR(spiral_vase);
|
||||||
|
|
|
@ -410,7 +410,7 @@ const std::vector<std::string>& Preset::print_options()
|
||||||
"perimeter_speed", "small_perimeter_speed", "external_perimeter_speed", "infill_speed", "solid_infill_speed",
|
"perimeter_speed", "small_perimeter_speed", "external_perimeter_speed", "infill_speed", "solid_infill_speed",
|
||||||
"top_solid_infill_speed", "support_material_speed", "support_material_xy_spacing", "support_material_interface_speed",
|
"top_solid_infill_speed", "support_material_speed", "support_material_xy_spacing", "support_material_interface_speed",
|
||||||
"bridge_speed", "gap_fill_speed", "travel_speed", "first_layer_speed", "perimeter_acceleration", "infill_acceleration",
|
"bridge_speed", "gap_fill_speed", "travel_speed", "first_layer_speed", "perimeter_acceleration", "infill_acceleration",
|
||||||
"bridge_acceleration", "first_layer_acceleration", "default_acceleration", "skirts", "skirt_distance", "skirt_height",
|
"bridge_acceleration", "first_layer_acceleration", "default_acceleration", "skirts", "skirt_distance", "skirt_height", "infinit_skirt",
|
||||||
"min_skirt_length", "brim_width", "support_material", "support_material_auto", "support_material_threshold", "support_material_enforce_layers",
|
"min_skirt_length", "brim_width", "support_material", "support_material_auto", "support_material_threshold", "support_material_enforce_layers",
|
||||||
"raft_layers", "support_material_pattern", "support_material_with_sheath", "support_material_spacing",
|
"raft_layers", "support_material_pattern", "support_material_with_sheath", "support_material_spacing",
|
||||||
"support_material_synchronize_layers", "support_material_angle", "support_material_interface_layers",
|
"support_material_synchronize_layers", "support_material_angle", "support_material_interface_layers",
|
||||||
|
|
|
@ -1178,6 +1178,7 @@ void TabPrint::build()
|
||||||
optgroup->append_single_option_line("skirts");
|
optgroup->append_single_option_line("skirts");
|
||||||
optgroup->append_single_option_line("skirt_distance");
|
optgroup->append_single_option_line("skirt_distance");
|
||||||
optgroup->append_single_option_line("skirt_height");
|
optgroup->append_single_option_line("skirt_height");
|
||||||
|
optgroup->append_single_option_line("infinit_skirt");
|
||||||
optgroup->append_single_option_line("min_skirt_length");
|
optgroup->append_single_option_line("min_skirt_length");
|
||||||
|
|
||||||
optgroup = page->new_optgroup(_(L("Brim")));
|
optgroup = page->new_optgroup(_(L("Brim")));
|
||||||
|
|
Loading…
Add table
Reference in a new issue