mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
Add sparse / internal solid infill accel controls (#382)
* Add sparse / internal solid infill accel controls * infill accel control as % * update tooltip * update to abs value
This commit is contained in:
parent
3a670040c7
commit
d535d70d03
7 changed files with 33 additions and 4 deletions
|
@ -3715,8 +3715,12 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
|
||||||
#endif
|
#endif
|
||||||
} else if (m_config.get_abs_value("bridge_acceleration") > 0 && is_bridge(path.role())) {
|
} else if (m_config.get_abs_value("bridge_acceleration") > 0 && is_bridge(path.role())) {
|
||||||
acceleration = m_config.get_abs_value("bridge_acceleration");
|
acceleration = m_config.get_abs_value("bridge_acceleration");
|
||||||
|
} else if (m_config.get_abs_value("sparse_infill_acceleration") > 0 && (path.role() == erInternalInfill)) {
|
||||||
|
acceleration = m_config.get_abs_value("sparse_infill_acceleration");
|
||||||
|
} else if (m_config.get_abs_value("internal_solid_infill_acceleration") > 0 && (path.role() == erSolidInfill)) {
|
||||||
|
acceleration = m_config.get_abs_value("internal_solid_infill_acceleration");
|
||||||
} else if (m_config.outer_wall_acceleration.value > 0 && is_external_perimeter(path.role())) {
|
} else if (m_config.outer_wall_acceleration.value > 0 && is_external_perimeter(path.role())) {
|
||||||
acceleration = m_config.outer_wall_acceleration.value;
|
acceleration = m_config.outer_wall_acceleration.value;
|
||||||
} else if (m_config.inner_wall_acceleration.value > 0 && is_internal_perimeter(path.role())) {
|
} else if (m_config.inner_wall_acceleration.value > 0 && is_internal_perimeter(path.role())) {
|
||||||
acceleration = m_config.inner_wall_acceleration.value;
|
acceleration = m_config.inner_wall_acceleration.value;
|
||||||
} else if (m_config.top_surface_acceleration.value > 0 && is_top_surface(path.role())) {
|
} else if (m_config.top_surface_acceleration.value > 0 && is_top_surface(path.role())) {
|
||||||
|
|
|
@ -751,8 +751,9 @@ static std::vector<std::string> s_Preset_print_options {
|
||||||
// SoftFever
|
// SoftFever
|
||||||
"small_perimeter_speed", "small_perimeter_threshold","bridge_angle", "filter_out_gap_fill", "post_process", "travel_acceleration","inner_wall_acceleration",
|
"small_perimeter_speed", "small_perimeter_threshold","bridge_angle", "filter_out_gap_fill", "post_process", "travel_acceleration","inner_wall_acceleration",
|
||||||
"default_jerk", "outer_wall_jerk", "inner_wall_jerk", "infill_jerk", "top_surface_jerk", "initial_layer_jerk","travel_jerk",
|
"default_jerk", "outer_wall_jerk", "inner_wall_jerk", "infill_jerk", "top_surface_jerk", "initial_layer_jerk","travel_jerk",
|
||||||
"top_solid_infill_flow_ratio","bottom_solid_infill_flow_ratio","only_one_wall_first_layer",
|
"top_solid_infill_flow_ratio","bottom_solid_infill_flow_ratio","only_one_wall_first_layer", "print_flow_ratio", "seam_gap",
|
||||||
"print_flow_ratio","seam_gap","role_based_wipe_speed","wipe_speed","accel_to_decel_enable", "accel_to_decel_factor", "wipe_on_loops", "bridge_density", "precise_outer_wall", "overhang_speed_classic", "bridge_acceleration"
|
"role_based_wipe_speed", "wipe_speed", "accel_to_decel_enable", "accel_to_decel_factor", "wipe_on_loops",
|
||||||
|
"bridge_density", "precise_outer_wall", "overhang_speed_classic", "bridge_acceleration", "sparse_infill_acceleration", "internal_solid_infill_acceleration"
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -106,6 +106,8 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
|
||||||
"top_surface_acceleration",
|
"top_surface_acceleration",
|
||||||
"bridge_acceleration",
|
"bridge_acceleration",
|
||||||
"travel_acceleration",
|
"travel_acceleration",
|
||||||
|
"sparse_infill_acceleration",
|
||||||
|
"internal_solid_infill_acceleration"
|
||||||
// BBS
|
// BBS
|
||||||
"cool_plate_temp_initial_layer",
|
"cool_plate_temp_initial_layer",
|
||||||
"eng_plate_temp_initial_layer",
|
"eng_plate_temp_initial_layer",
|
||||||
|
|
|
@ -1476,6 +1476,24 @@ void PrintConfigDef::init_fff_params()
|
||||||
def->ratio_over = "outer_wall_acceleration";
|
def->ratio_over = "outer_wall_acceleration";
|
||||||
def->set_default_value(new ConfigOptionFloatOrPercent(50,true));
|
def->set_default_value(new ConfigOptionFloatOrPercent(50,true));
|
||||||
|
|
||||||
|
def = this->add("sparse_infill_acceleration", coFloatOrPercent);
|
||||||
|
def->label = L("Sparse infill");
|
||||||
|
def->tooltip = L("Acceleration of sparse infill. If the value is expressed as a percentage (e.g. 100%), it will be calculated based on the default acceleration.");
|
||||||
|
def->sidetext = L("mm/s² or %");
|
||||||
|
def->min = 0;
|
||||||
|
def->mode = comAdvanced;
|
||||||
|
def->ratio_over = "default_acceleration";
|
||||||
|
def->set_default_value(new ConfigOptionFloatOrPercent(100, true));
|
||||||
|
|
||||||
|
def = this->add("internal_solid_infill_acceleration", coFloatOrPercent);
|
||||||
|
def->label = L("Internal solid infill");
|
||||||
|
def->tooltip = L("Acceleration of internal solid infill. If the value is expressed as a percentage (e.g. 100%), it will be calculated based on the default acceleration.");
|
||||||
|
def->sidetext = L("mm/s² or %");
|
||||||
|
def->min = 0;
|
||||||
|
def->mode = comAdvanced;
|
||||||
|
def->ratio_over = "default_acceleration";
|
||||||
|
def->set_default_value(new ConfigOptionFloatOrPercent(100, true));
|
||||||
|
|
||||||
def = this->add("initial_layer_acceleration", coFloat);
|
def = this->add("initial_layer_acceleration", coFloat);
|
||||||
def->label = L("Initial layer");
|
def->label = L("Initial layer");
|
||||||
def->tooltip = L("Acceleration of initial layer. Using a lower value can improve build plate adhensive");
|
def->tooltip = L("Acceleration of initial layer. Using a lower value can improve build plate adhensive");
|
||||||
|
|
|
@ -911,6 +911,8 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
|
||||||
((ConfigOptionFloat, initial_layer_acceleration))
|
((ConfigOptionFloat, initial_layer_acceleration))
|
||||||
((ConfigOptionFloatOrPercent, bridge_acceleration))
|
((ConfigOptionFloatOrPercent, bridge_acceleration))
|
||||||
((ConfigOptionFloat, travel_acceleration))
|
((ConfigOptionFloat, travel_acceleration))
|
||||||
|
((ConfigOptionFloatOrPercent, sparse_infill_acceleration))
|
||||||
|
((ConfigOptionFloatOrPercent, internal_solid_infill_acceleration))
|
||||||
((ConfigOptionFloat, initial_layer_line_width))
|
((ConfigOptionFloat, initial_layer_line_width))
|
||||||
((ConfigOptionFloat, initial_layer_print_height))
|
((ConfigOptionFloat, initial_layer_print_height))
|
||||||
((ConfigOptionFloat, initial_layer_speed))
|
((ConfigOptionFloat, initial_layer_speed))
|
||||||
|
|
|
@ -548,7 +548,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
|
||||||
bool have_default_acceleration = config->opt_float("default_acceleration") > 0;
|
bool have_default_acceleration = config->opt_float("default_acceleration") > 0;
|
||||||
//BBS
|
//BBS
|
||||||
for (auto el : {"outer_wall_acceleration", "inner_wall_acceleration", "initial_layer_acceleration",
|
for (auto el : {"outer_wall_acceleration", "inner_wall_acceleration", "initial_layer_acceleration",
|
||||||
"top_surface_acceleration", "travel_acceleration", "bridge_acceleration"})
|
"top_surface_acceleration", "travel_acceleration", "bridge_acceleration", "sparse_infill_acceleration", "internal_solid_infill_acceleration"})
|
||||||
toggle_field(el, have_default_acceleration);
|
toggle_field(el, have_default_acceleration);
|
||||||
|
|
||||||
bool have_default_jerk = config->opt_float("default_jerk") > 0;
|
bool have_default_jerk = config->opt_float("default_jerk") > 0;
|
||||||
|
|
|
@ -1942,6 +1942,8 @@ void TabPrint::build()
|
||||||
optgroup->append_single_option_line("outer_wall_acceleration");
|
optgroup->append_single_option_line("outer_wall_acceleration");
|
||||||
optgroup->append_single_option_line("inner_wall_acceleration");
|
optgroup->append_single_option_line("inner_wall_acceleration");
|
||||||
optgroup->append_single_option_line("bridge_acceleration");
|
optgroup->append_single_option_line("bridge_acceleration");
|
||||||
|
optgroup->append_single_option_line("sparse_infill_acceleration");
|
||||||
|
optgroup->append_single_option_line("internal_solid_infill_acceleration");
|
||||||
optgroup->append_single_option_line("initial_layer_acceleration");
|
optgroup->append_single_option_line("initial_layer_acceleration");
|
||||||
optgroup->append_single_option_line("top_surface_acceleration");
|
optgroup->append_single_option_line("top_surface_acceleration");
|
||||||
optgroup->append_single_option_line("travel_acceleration");
|
optgroup->append_single_option_line("travel_acceleration");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue