GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 04:45:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to some default values, and various fixes

Browse Source 
typos
custom gcode panel size
min first layer speed now a float.
This commit is contained in:
supermerill 2021-10-30 03:33:17 +02:00
parent 4e6753f81a
commit 0a61223a53
9 changed files with 79 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/ui_layout/Readme.md
View File

@ -49,11 +49,12 @@ each parameter is separated by ':'
* sidetext_width$INT: the suffix label length (override the group one). -1 for auto. * sidetext_width$INT: the suffix label length (override the group one). -1 for auto.
* simple|advanced|expert: add one of these to modify the mode in which this setting appear. * simple|advanced|expert: add one of these to modify the mode in which this setting appear.
* width$INT: change the width of the field. Shouod work on most type of settings. * width$INT: change the width of the field. Shouod work on most type of settings.
* height$INT: change the height of the field. Don't works with every type of setting. * height$INT: change the height of the field. Don't works with every type of setting (mostly multilne text). Set to -1 to 'disable'.
* precision$INT: number of digit after the dot displayed. * precision$INT: number of digit after the dot displayed.
* url$STR: the url to call when clicking on it. * url$STR: the url to call when clicking on it.
* id $INT: for setting only a single value of a setting array. * id $INT: for setting only a single value of a setting array.
* idx: for setting only a single value of a setting array, with the index of the page (for extruder ui page) * idx: for setting only a single value of a setting array, with the index of the page (for extruder ui page)
* height:INT: change the default height of settings. Don't works with every type of setting (mostly multilne text). Set to 0 or -1 to disable.
* recommended_thin_wall_thickness_description: create a text widget to explain recommended thin wall thickness (only in a fff print tab). * recommended_thin_wall_thickness_description: create a text widget to explain recommended thin wall thickness (only in a fff print tab).
* parent_preset_description: create a text widget to explain parent preset. * parent_preset_description: create a text widget to explain parent preset.
* cooling_description: create a text widget to explain cooling (only in a filament tab). * cooling_description: create a text widget to explain cooling (only in a filament tab).

18
resources/ui_layout/printer_fff.ui
View File

@ -58,25 +58,25 @@ group:
setting:start_gcode_manual setting:start_gcode_manual
height:15 height:15
group:no_title:Start G-code group:no_title:Start G-code
setting:full_width:start_gcode setting:full_width:height$21:start_gcode
group:no_title:End G-code group:no_title:End G-code
setting:full_width:end_gcode setting:full_width:end_gcode
group:no_title:Before layer change G-code group:no_title:Before layer change G-code
setting:full_width:before_layer_gcode setting:full_width:height$9:before_layer_gcode
group:no_title:After layer change G-code group:no_title:After layer change G-code
setting:full_width:layer_gcode setting:full_width:height$9:layer_gcode
group:no_title:Tool change G-code group:no_title:Tool change G-code
setting:full_width:toolchange_gcode setting:full_width:height$9:toolchange_gcode
group:no_title:Between objects G-code (for sequential printing) group:no_title:Between objects G-code (for sequential printing)
setting:full_width:between_objects_gcode setting:full_width:height$9:between_objects_gcode
group:no_title:Between extrusion role change G-code group:no_title:Between extrusion role change G-code
setting:full_width:feature_gcode setting:full_width:height$9:feature_gcode
group:no_title:Colour Change G-code group:no_title:Colour Change G-code
setting:full_width:color_change_gcode setting:full_width:height$5:color_change_gcode
group:no_title:Pause Print G-code group:no_title:Pause Print G-code
setting:full_width:pause_print_gcode setting:full_width:height$5:pause_print_gcode
group:no_title:Template Custom G-code group:no_title:Template Custom G-code
setting:full_width:template_custom_gcode setting:full_width:height$5:template_custom_gcode
height:0 height:0
page:Notes:note.png page:Notes:note.png

2
src/libslic3r/AppConfig.cpp
View File

@ -200,7 +200,7 @@ void AppConfig::set_defaults()
if (get("use_rich_tooltip").empty()) if (get("use_rich_tooltip").empty())
set("use_rich_tooltip", set("use_rich_tooltip",
#ifndef WIN32 #if __APPLE__
"1" "1"
#else #else
"0" "0"

4
src/libslic3r/Config.hpp
View File

@ -302,13 +302,13 @@ public:
// if true, this option doesn't need to be saved, it's a computed value from an other configOption. // if true, this option doesn't need to be saved, it's a computed value from an other configOption.
// uint32_t because macos crash if it's a bool. and it doesn't change the size of the object because of alignment. // uint32_t because macos crash if it's a bool. and it doesn't change the size of the object because of alignment.
uint32_t flags; uint32_t flags;
enum FlagsConfigOption : uint8_t { enum FlagsConfigOption : uint32_t {
FCO_PHONY = 1, FCO_PHONY = 1,
FCO_EXTRUDER_ARRAY = 1 << 1, FCO_EXTRUDER_ARRAY = 1 << 1,
}; };
ConfigOption() : flags(uint32_t(0)) {} ConfigOption() : flags(uint32_t(0)) {}
ConfigOption(bool phony) : flags(uint32_t(FlagsConfigOption::FCO_PHONY)) {} ConfigOption(bool phony) : flags(phony ? uint32_t(FlagsConfigOption::FCO_PHONY) : uint32_t(0)) {}
virtual ~ConfigOption() {} virtual ~ConfigOption() {}

2
src/libslic3r/GCode.cpp
View File

@ -3852,7 +3852,7 @@ double_t GCode::_compute_speed_mm_per_sec(const ExtrusionPath& path, double spee
if (first_layer_speed > 0) if (first_layer_speed > 0)
speed = std::min(first_layer_speed, speed); speed = std::min(first_layer_speed, speed);
} }
double first_layer_min_speed = m_config.first_layer_min_speed.get_abs_value(base_speed); double first_layer_min_speed = m_config.first_layer_min_speed.value;
speed = std::max(first_layer_min_speed, speed); speed = std::max(first_layer_min_speed, speed);
} }
// cap speed with max_volumetric_speed anyway (even if user is not using autospeed) // cap speed with max_volumetric_speed anyway (even if user is not using autospeed)

92
src/libslic3r/PrintConfig.cpp
View File

@ -339,7 +339,6 @@ void PrintConfigDef::init_fff_params()
def->label = L("Bridges fan speed"); def->label = L("Bridges fan speed");
def->category = OptionCategory::cooling; def->category = OptionCategory::cooling;
def->tooltip = L("This fan speed is enforced during bridges and overhangs. It won't slow down the fan if it's currently running at a higher speed." def->tooltip = L("This fan speed is enforced during bridges and overhangs. It won't slow down the fan if it's currently running at a higher speed."
"\nSet to 1 to disable the fan."
"\nSet to -1 to disable this override." "\nSet to -1 to disable this override."
"\nCan only be overriden by disable_fan_first_layers."); "\nCan only be overriden by disable_fan_first_layers.");
def->sidetext = L("%"); def->sidetext = L("%");
@ -353,8 +352,8 @@ void PrintConfigDef::init_fff_params()
def->label = L("Infill bridges fan speed"); def->label = L("Infill bridges fan speed");
def->category = OptionCategory::cooling; def->category = OptionCategory::cooling;
def->tooltip = L("This fan speed is enforced during all infill bridges. It won't slow down the fan if it's currently running at a higher speed." def->tooltip = L("This fan speed is enforced during all infill bridges. It won't slow down the fan if it's currently running at a higher speed."
"\nSet to 1 to disable the fan." "\nSet to 1 to follow default speed."
"\nSet to -1 to disable this override (will take the value of Bridges fan speed)." "\nSet to -1 to disable this override (internal bridges will use Bridges fan speed)."
"\nCan only be overriden by disable_fan_first_layers."); "\nCan only be overriden by disable_fan_first_layers.");
def->sidetext = L("%"); def->sidetext = L("%");
def->min = -1; def->min = -1;
@ -691,7 +690,7 @@ void PrintConfigDef::init_fff_params()
def->max = 1000; def->max = 1000;
def->mode = comExpert; def->mode = comExpert;
def->is_vector_extruder = true; def->is_vector_extruder = true;
def->set_default_value(new ConfigOptionInts { 3 }); def->set_default_value(new ConfigOptionInts { 1 });
def = this->add("dont_support_bridges", coBool); def = this->add("dont_support_bridges", coBool);
def->label = L("Don't support bridges"); def->label = L("Don't support bridges");
@ -715,7 +714,7 @@ void PrintConfigDef::init_fff_params()
def->sidetext = L("mm"); def->sidetext = L("mm");
def->aliases = { "multiply_distance" }; def->aliases = { "multiply_distance" };
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionFloat(0)); def->set_default_value(new ConfigOptionFloat(6));
def = this->add("end_gcode", coString); def = this->add("end_gcode", coString);
def->label = L("End G-code"); def->label = L("End G-code");
@ -747,7 +746,8 @@ void PrintConfigDef::init_fff_params()
def->label = L("Ensure vertical shell thickness"); def->label = L("Ensure vertical shell thickness");
def->category = OptionCategory::perimeter; def->category = OptionCategory::perimeter;
def->tooltip = L("Add solid infill near sloping surfaces to guarantee the vertical shell thickness " def->tooltip = L("Add solid infill near sloping surfaces to guarantee the vertical shell thickness "
"(top+bottom solid layers)."); "(top+bottom solid layers)."
"\n!! solid_over_perimeters may erase these surfaces !! So you should deactivate it if you want to use this.");
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));
@ -884,7 +884,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloatOrPercent(105, true, false));
def = this->add("external_perimeter_extrusion_spacing", coFloatOrPercent); def = this->add("external_perimeter_extrusion_spacing", coFloatOrPercent);
def->label = L("External perimeters"); def->label = L("External perimeters");
@ -1161,7 +1161,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("extruder_colour", coStrings); def = this->add("extruder_colour", coStrings);
def->label = L("Extruder Color"); def->label = L("Extruder Color");
def->category = OptionCategory::extruders; def->category = OptionCategory::extruders;
def->tooltip = L("This is only used in the Slic3r interface as a visual help."); def->tooltip = L("This is only used in Slic3r interface as a visual help.");
def->gui_type = "color"; def->gui_type = "color";
// Empty string means no color assigned yet. // Empty string means no color assigned yet.
def->mode = comAdvanced; def->mode = comAdvanced;
@ -1249,7 +1249,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true));
def = this->add("extrusion_spacing", coFloatOrPercent); def = this->add("extrusion_spacing", coFloatOrPercent);
def->label = L("Default extrusion spacing"); def->label = L("Default extrusion spacing");
@ -1263,7 +1263,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true)); def->set_default_value(new ConfigOptionFloatOrPercent(100, true, false));
def = this->add("fan_always_on", coBools); def = this->add("fan_always_on", coBools);
def->label = L("Keep fan always on"); def->label = L("Keep fan always on");
@ -1272,7 +1272,7 @@ void PrintConfigDef::init_fff_params()
" Useful for PLA, harmful for ABS."); " Useful for PLA, harmful for ABS.");
def->mode = comSimple; def->mode = comSimple;
def->is_vector_extruder = true; def->is_vector_extruder = true;
def->set_default_value(new ConfigOptionBools{ false }); def->set_default_value(new ConfigOptionBools{ true });
def = this->add("fan_below_layer_time", coInts); def = this->add("fan_below_layer_time", coInts);
def->label = L("Enable fan if layer print time is below"); def->label = L("Enable fan if layer print time is below");
@ -1901,7 +1901,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(140, true)); def->set_default_value(new ConfigOptionFloatOrPercent(140, true, false));
def = this->add("first_layer_extrusion_spacing", coFloatOrPercent); def = this->add("first_layer_extrusion_spacing", coFloatOrPercent);
def->label = L("First layer"); def->label = L("First layer");
@ -1935,11 +1935,9 @@ void PrintConfigDef::init_fff_params()
def->label = L("Max"); def->label = L("Max");
def->full_label = L("Default first layer speed"); def->full_label = L("Default first layer speed");
def->category = OptionCategory::speed; def->category = OptionCategory::speed;
def->tooltip = L("If expressed as absolute value in mm/s, this speed will be applied to all the print moves " def->tooltip = L("If expressed as absolute value in mm/s, this speed will be applied as a maximum to all the print moves (but infill) of the first layer."
"but infill of the first layer, it can be overwritten by the 'default' (default depends of the type of the path) " "\nIf expressed as a percentage it will scale the current speed."
"speed if it's lower than that. If expressed as a percentage " "\nSet it at 100% to remove any first layer speed modification (but for infill).");
"it will scale the current speed."
"\nSet it at 100% to remove any first layer speed modification (with first_layer_infill_speed and first_layer_speed_min).");
def->sidetext = L("mm/s or %"); def->sidetext = L("mm/s or %");
def->ratio_over = "depends"; def->ratio_over = "depends";
def->min = 0; def->min = 0;
@ -1950,29 +1948,25 @@ void PrintConfigDef::init_fff_params()
def->label = L("Infill"); def->label = L("Infill");
def->full_label = L("Infill first layer speed"); def->full_label = L("Infill first layer speed");
def->category = OptionCategory::speed; def->category = OptionCategory::speed;
def->tooltip = L("If expressed as absolute value in mm/s, this speed will be applied to infill moves " def->tooltip = L("If expressed as absolute value in mm/s, this speed will be applied as a maximum for all infill print moves of the first layer."
"of the first layer, it can be overwritten by the 'default' (solid infill or infill if not bottom) " "\nIf expressed as a percentage it will scale the current infill speed."
"speed if it's lower than that. If expressed as a percentage " "\nSet it at 100% to remove any infill first layer speed modification.");
"(for example: 40%) it will scale the current infill speed.");
def->sidetext = L("mm/s or %"); def->sidetext = L("mm/s or %");
def->ratio_over = "depends"; def->ratio_over = "depends";
def->min = 0; def->min = 0;
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionFloatOrPercent(30, false)); def->set_default_value(new ConfigOptionFloatOrPercent(30, false));
def = this->add("first_layer_min_speed", coFloatOrPercent); def = this->add("first_layer_min_speed", coFloat);
def->label = L("Min"); def->label = L("Min");
def->full_label = L("Min first layer speed"); def->full_label = L("Min first layer speed");
def->category = OptionCategory::speed; def->category = OptionCategory::speed;
def->tooltip = L("If expressed as absolute value in mm/s, this speed will be applied to all the print moves" def->tooltip = L("Minimum speed when printing the first layer."
", it can be overwritten by the 'default' (default depends of the type of the path) speed if it's higher than that."
" If expressed as a percentage it will scale the current speed."
"\nSet zero to disable."); "\nSet zero to disable.");
def->sidetext = L("mm/s or %"); def->sidetext = L("mm/s");
def->ratio_over = "depends";
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloat(0));
def = this->add("first_layer_temperature", coInts); def = this->add("first_layer_temperature", coInts);
def->label = L("First layer"); def->label = L("First layer");
@ -1996,7 +1990,7 @@ void PrintConfigDef::init_fff_params()
def->max = 1000; def->max = 1000;
def->mode = comExpert; def->mode = comExpert;
def->is_vector_extruder = true; def->is_vector_extruder = true;
def->set_default_value(new ConfigOptionInts { 0 }); def->set_default_value(new ConfigOptionInts { 4 });
def = this->add("gap_fill", coBool); def = this->add("gap_fill", coBool);
def->label = L("Gap fill"); def->label = L("Gap fill");
@ -2013,7 +2007,7 @@ void PrintConfigDef::init_fff_params()
def->category = OptionCategory::perimeter; def->category = OptionCategory::perimeter;
def->tooltip = L("All gaps, between the last perimeter and the infill, which are thinner than a perimeter will be filled by gapfill."); def->tooltip = L("All gaps, between the last perimeter and the infill, which are thinner than a perimeter will be filled by gapfill.");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionBool{true }); def->set_default_value(new ConfigOptionBool(false));
def = this->add("gap_fill_min_area", coFloatOrPercent); def = this->add("gap_fill_min_area", coFloatOrPercent);
def->label = L("Min surface"); def->label = L("Min surface");
@ -2066,7 +2060,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("All characters that are written here will be replaced by '_' when writing the gcode file name." def->tooltip = L("All characters that are written here will be replaced by '_' when writing the gcode file name."
"\nIf the first charater is '[' or '(', then this field will be considered as a regexp (enter '[^a-zA-Z0-9]' to only use ascii char)."); "\nIf the first charater is '[' or '(', then this field will be considered as a regexp (enter '[^a-zA-Z0-9]' to only use ascii char).");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionString("")); def->set_default_value(new ConfigOptionString("[<>:\"/\\\\|?*]"));
def = this->add("gcode_flavor", coEnum); def = this->add("gcode_flavor", coEnum);
def->label = L("G-code flavor"); def->label = L("G-code flavor");
@ -2102,7 +2096,7 @@ void PrintConfigDef::init_fff_params()
def->enum_labels.push_back("Lerdge"); def->enum_labels.push_back("Lerdge");
def->enum_labels.push_back(L("No extrusion")); def->enum_labels.push_back(L("No extrusion"));
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<GCodeFlavor>(gcfSprinter)); def->set_default_value(new ConfigOptionEnum<GCodeFlavor>(gcfMarlin));
def = this->add("gcode_filename_illegal_char", coString); def = this->add("gcode_filename_illegal_char", coString);
def->label = L("Illegal characters"); def->label = L("Illegal characters");
@ -2341,7 +2335,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true));
def = this->add("infill_extrusion_spacing", coFloatOrPercent); def = this->add("infill_extrusion_spacing", coFloatOrPercent);
def->label = L("Infill"); def->label = L("Infill");
@ -2356,7 +2350,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true)); def->set_default_value(new ConfigOptionFloatOrPercent(100, true, false));
def = this->add("infill_first", coBool); def = this->add("infill_first", coBool);
def->label = L("Infill before perimeters"); def->label = L("Infill before perimeters");
@ -2519,7 +2513,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("remaining_times", coBool); def = this->add("remaining_times", coBool);
def->label = L("Supports remaining times"); def->label = L("Supports remaining times");
def->category = OptionCategory::firmware; def->category = OptionCategory::firmware;
def->tooltip = L("Emit somethign at 1 minute intervals into the G-code to let the firmware show accurate remaining time."); def->tooltip = L("Emit something at 1 minute intervals into the G-code to let the firmware show accurate remaining time.");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));
@ -3095,7 +3089,8 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Round corners for perimeters"); def->full_label = L("Round corners for perimeters");
def->category = OptionCategory::perimeter; def->category = OptionCategory::perimeter;
def->tooltip = L("Internal perimeters will go around sharp corners by turning around instead of making the same sharp corner." def->tooltip = L("Internal perimeters will go around sharp corners by turning around instead of making the same sharp corner."
" This can help when there are visible holes in sharp corners on perimeters"); " This can help when there are visible holes in sharp corners on perimeters. It also help to print the letters on the benchy stern."
"\nCan incur some more processing time, and corners are a bit less sharp.");
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));
@ -3124,7 +3119,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true));
def = this->add("perimeter_extrusion_spacing", coFloatOrPercent); def = this->add("perimeter_extrusion_spacing", coFloatOrPercent);
def->label = L("Perimeters"); def->label = L("Perimeters");
@ -3139,7 +3134,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true)); def->set_default_value(new ConfigOptionFloatOrPercent(100, true, false));
def = this->add("perimeter_speed", coFloat); def = this->add("perimeter_speed", coFloat);
def->label = L("Internal"); def->label = L("Internal");
@ -3437,7 +3432,7 @@ void PrintConfigDef::init_fff_params()
def->sidetext = L("%"); def->sidetext = L("%");
def->min = 0; def->min = 0;
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionPercent(100)); def->set_default_value(new ConfigOptionPercent(80));
def = this->add("seam_travel_cost", coPercent); def = this->add("seam_travel_cost", coPercent);
def->label = L("Travel cost"); def->label = L("Travel cost");
@ -3447,7 +3442,7 @@ void PrintConfigDef::init_fff_params()
def->sidetext = L("%"); def->sidetext = L("%");
def->min = 0; def->min = 0;
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionPercent(100)); def->set_default_value(new ConfigOptionPercent(20));
def = this->add("seam_gap", coFloatsOrPercents); def = this->add("seam_gap", coFloatsOrPercents);
def->label = L("Seam gap"); def->label = L("Seam gap");
@ -3696,7 +3691,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true));
def = this->add("solid_infill_extrusion_spacing", coFloatOrPercent); def = this->add("solid_infill_extrusion_spacing", coFloatOrPercent);
def->label = L("Solid spacing"); def->label = L("Solid spacing");
@ -3711,7 +3706,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false, true)); def->set_default_value(new ConfigOptionFloatOrPercent(100, true, false));
def = this->add("solid_infill_speed", coFloatOrPercent); def = this->add("solid_infill_speed", coFloatOrPercent);
def->label = L("Solid"); def->label = L("Solid");
@ -3878,11 +3873,12 @@ void PrintConfigDef::init_fff_params()
def->category = OptionCategory::perimeter; def->category = OptionCategory::perimeter;
def->tooltip = L("When you have a medium/hight number of top/bottom solid layers, and a low/medium of perimeters," def->tooltip = L("When you have a medium/hight number of top/bottom solid layers, and a low/medium of perimeters,"
" then it have to put some solid infill inside the part to have enough solid layers." " then it have to put some solid infill inside the part to have enough solid layers."
"\nBy setting this to somethign higher than 0, you can remove this 'inside filling'." "\nBy setting this to something higher than 0, you can remove this 'inside filling'."
" This number allow to keep some if there is a low number of perimeter over the void." " This number allow to keep some if there is a low number of perimeter over the void."
"\nIf this setting is equal or higher than the top/bottom solid layer count, it won't evict anything." "\nIf this setting is equal or higher than the top/bottom solid layer count, it won't evict anything."
"\nIf this setting is set to 1, it will evict all solid fill are are only over perimeters." "\nIf this setting is set to 1, it will evict all solid fill are are only over perimeters."
"\nSet zero to disable."); "\nSet zero to disable."
"\n!! ensure_vertical_shell_thickness may be erased by this setting !! You may want to deactivate at least one of the two.");
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionInt(2)); def->set_default_value(new ConfigOptionInt(2));
@ -4299,7 +4295,7 @@ void PrintConfigDef::init_fff_params()
def->precision = 6; def->precision = 6;
def->can_phony = true; def->can_phony = true;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(0, false)); def->set_default_value(new ConfigOptionFloatOrPercent(105, true, false));
def = this->add("top_infill_extrusion_spacing", coFloatOrPercent); def = this->add("top_infill_extrusion_spacing", coFloatOrPercent);
def->label = L("Top solid spacing"); def->label = L("Top solid spacing");
@ -5680,6 +5676,8 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
value = "5"; value = "5";
} }
} }
if ("first_layer_min_speed" == opt_key && value.back() == '%')
value = value.substr(0, value.length() - 1); //no percent.
// Ignore the following obsolete configuration keys: // Ignore the following obsolete configuration keys:
static std::set<std::string> ignore = { static std::set<std::string> ignore = {
@ -5737,6 +5735,10 @@ std::map<std::string,std::string> PrintConfigDef::from_prusa(t_config_option_key
if(value == "0") if(value == "0")
output["infill_connection"] = "notconnected"; output["infill_connection"] = "notconnected";
} }
if ("first_layer_speed" == opt_key) {
output["first_layer_min_speed"] = value;
output["first_layer_infill_speed"] = value;
}
return output; return output;
} }

2
src/libslic3r/PrintConfig.hpp
View File

@ -1334,7 +1334,7 @@ public:
ConfigOptionPercent first_layer_flow_ratio; ConfigOptionPercent first_layer_flow_ratio;
ConfigOptionFloatOrPercent first_layer_speed; ConfigOptionFloatOrPercent first_layer_speed;
ConfigOptionFloatOrPercent first_layer_infill_speed; ConfigOptionFloatOrPercent first_layer_infill_speed;
ConfigOptionFloatOrPercent first_layer_min_speed; ConfigOptionFloat first_layer_min_speed;
ConfigOptionInts first_layer_temperature; ConfigOptionInts first_layer_temperature;
ConfigOptionInts full_fan_speed_layer; ConfigOptionInts full_fan_speed_layer;
ConfigOptionFloatOrPercent infill_acceleration; ConfigOptionFloatOrPercent infill_acceleration;

6
src/slic3r/GUI/PresetHints.cpp
View File

@ -205,7 +205,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
const auto &top_infill_extrusion_width = *print_config.option<ConfigOptionFloatOrPercent>("top_infill_extrusion_width"); const auto &top_infill_extrusion_width = *print_config.option<ConfigOptionFloatOrPercent>("top_infill_extrusion_width");
const auto &first_layer_speed = *print_config.option<ConfigOptionFloatOrPercent>("first_layer_speed"); const auto &first_layer_speed = *print_config.option<ConfigOptionFloatOrPercent>("first_layer_speed");
const auto& first_layer_infill_speed = *print_config.option<ConfigOptionFloatOrPercent>("first_layer_infill_speed"); const auto& first_layer_infill_speed = *print_config.option<ConfigOptionFloatOrPercent>("first_layer_infill_speed");
const auto& first_layer_min_speed = *print_config.option<ConfigOptionFloatOrPercent>("first_layer_infill_speed"); const auto& first_layer_min_speed = *print_config.option<ConfigOptionFloat>("first_layer_min_speed");
// Index of an extruder assigned to a feature. If set to 0, an active extruder will be used for a multi-material print. // Index of an extruder assigned to a feature. If set to 0, an active extruder will be used for a multi-material print.
// If different from idx_extruder, it will not be taken into account for this hint. // If different from idx_extruder, it will not be taken into account for this hint.
@ -242,7 +242,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
// Apply the first layer limit. // Apply the first layer limit.
if (first_layer_speed.value > 0) if (first_layer_speed.value > 0)
speed_normal = std::min(first_layer_speed.get_abs_value(base_speed), speed_normal); speed_normal = std::min(first_layer_speed.get_abs_value(base_speed), speed_normal);
speed_normal = std::max(first_layer_min_speed.get_abs_value(base_speed), speed_normal); speed_normal = std::max(first_layer_min_speed.value, speed_normal);
} }
return (speed_normal > 0.) ? speed_normal : speed_max; return (speed_normal > 0.) ? speed_normal : speed_max;
}; };
@ -252,7 +252,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
// Apply the first layer limit. // Apply the first layer limit.
if(first_layer_infill_speed.value > 0) if(first_layer_infill_speed.value > 0)
speed_normal = std::min(first_layer_infill_speed.get_abs_value(base_speed), speed_normal); speed_normal = std::min(first_layer_infill_speed.get_abs_value(base_speed), speed_normal);
speed_normal = std::max(first_layer_min_speed.get_abs_value(base_speed), speed_normal); speed_normal = std::max(first_layer_min_speed.value, speed_normal);
} }
return (speed_normal > 0.) ? speed_normal : speed_max; return (speed_normal > 0.) ? speed_normal : speed_max;
}; };

6
src/slic3r/GUI/Tab.cpp
View File

@ -1810,6 +1810,10 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
if (current_group->sidetext_width >= 0) if (current_group->sidetext_width >= 0)
option.opt.sidetext_width = current_group->sidetext_width; option.opt.sidetext_width = current_group->sidetext_width;
// global before the loop because can be overriden
if (height > 0)
option.opt.height = height;
bool need_to_notified_search = false; bool need_to_notified_search = false;
bool colored = false; bool colored = false;
wxString label_path; wxString label_path;
@ -1883,8 +1887,6 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
if (need_to_notified_search) if (need_to_notified_search)
Search::OptionsSearcher::register_label_override(option.opt.opt_key, option.opt.label, option.opt.full_label, option.opt.tooltip); Search::OptionsSearcher::register_label_override(option.opt.opt_key, option.opt.label, option.opt.full_label, option.opt.tooltip);
if(height>0)
option.opt.height = height;
if (!in_line) { if (!in_line) {
if (colored) { if (colored) {