mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 06:57:36 -06:00
Merge branch 'main' into enh-port-edit-gcode-dlg
This commit is contained in:
commit
9f44e151ba
32 changed files with 423 additions and 196 deletions
|
@ -248,6 +248,7 @@ static t_config_enum_values s_keys_map_SeamPosition {
|
|||
};
|
||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SeamPosition)
|
||||
|
||||
// Orca
|
||||
static t_config_enum_values s_keys_map_InternalBridgeFilter {
|
||||
{ "disabled", ibfDisabled },
|
||||
{ "limited", ibfLimited },
|
||||
|
@ -255,6 +256,14 @@ static t_config_enum_values s_keys_map_InternalBridgeFilter {
|
|||
};
|
||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(InternalBridgeFilter)
|
||||
|
||||
// Orca
|
||||
static t_config_enum_values s_keys_map_GapFillTarget {
|
||||
{ "everywhere", gftEverywhere },
|
||||
{ "topbottom", gftTopBottom },
|
||||
{ "nowhere", gftNowhere },
|
||||
};
|
||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(GapFillTarget)
|
||||
|
||||
static const t_config_enum_values s_keys_map_SLADisplayOrientation = {
|
||||
{ "landscape", sladoLandscape},
|
||||
{ "portrait", sladoPortrait}
|
||||
|
@ -752,6 +761,26 @@ void PrintConfigDef::init_fff_params()
|
|||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->set_default_value(new ConfigOptionFloat(0.));
|
||||
|
||||
def = this->add("gap_fill_target", coEnum);
|
||||
def->label = L("Apply gap fill");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("Enables gap fill for the selected surfaces. The minimum gap length that will be filled can be controlled "
|
||||
"from the filter out tiny gaps option below.\n\n"
|
||||
"Options:\n"
|
||||
"1. Everywhere: Applies gap fill to top, bottom and internal solid surfaces\n"
|
||||
"2. Top and Bottom surfaces: Applies gap fill to top and bottom surfaces only\n"
|
||||
"3. Nowhere: Disables gap fill\n");
|
||||
def->enum_keys_map = &ConfigOptionEnum<GapFillTarget>::get_enum_values();
|
||||
def->enum_values.push_back("everywhere");
|
||||
def->enum_values.push_back("topbottom");
|
||||
def->enum_values.push_back("nowhere");
|
||||
def->enum_labels.push_back(L("Everywhere"));
|
||||
def->enum_labels.push_back(L("Top and bottom surfaces"));
|
||||
def->enum_labels.push_back(L("Nowhere"));
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionEnum<GapFillTarget>(gftEverywhere));
|
||||
|
||||
|
||||
def = this->add("enable_overhang_bridge_fan", coBools);
|
||||
def->label = L("Force cooling for overhang and bridge");
|
||||
|
@ -1297,6 +1326,16 @@ void PrintConfigDef::init_fff_params()
|
|||
"(top+bottom solid layers)");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(true));
|
||||
|
||||
def = this->add("reduce_wall_solid_infill", coBool);
|
||||
def->label = L("Further reduce solid infill on walls (experimental)");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("Further reduces any solid infill applied to walls. As there will be very limited infill supporting"
|
||||
" solid surfaces, make sure that you are using adequate number of walls to support the part on sloping surfaces.\n\n"
|
||||
"For heavily sloped surfaces this option is not suitable as it will generate too thin of a top layer "
|
||||
"and should be disabled.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
auto def_top_fill_pattern = def = this->add("top_surface_pattern", coEnum);
|
||||
def->label = L("Top surface pattern");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue