From d6146ecc842d744f3a074debaf8e130d389916c4 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 23 Oct 2023 21:05:38 +0800 Subject: [PATCH] Add accel and jerk to object config --- src/libslic3r/PrintConfig.hpp | 35 +++++++++++++++++++---------------- src/libslic3r/PrintObject.cpp | 2 +- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index c5c88373ce..443a76187f 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -766,6 +766,25 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloat, tree_support_branch_diameter_organic)) ((ConfigOptionFloat, tree_support_branch_angle_organic)) + // Move all acceleration and jerk settings to object + ((ConfigOptionFloat, default_acceleration)) + ((ConfigOptionFloat, outer_wall_acceleration)) + ((ConfigOptionFloat, inner_wall_acceleration)) + ((ConfigOptionFloat, top_surface_acceleration)) + ((ConfigOptionFloat, initial_layer_acceleration)) + ((ConfigOptionFloatOrPercent, bridge_acceleration)) + ((ConfigOptionFloat, travel_acceleration)) + ((ConfigOptionFloatOrPercent, sparse_infill_acceleration)) + ((ConfigOptionFloatOrPercent, internal_solid_infill_acceleration)) + + ((ConfigOptionFloat, default_jerk)) + ((ConfigOptionFloat, outer_wall_jerk)) + ((ConfigOptionFloat, inner_wall_jerk)) + ((ConfigOptionFloat, infill_jerk)) + ((ConfigOptionFloat, top_surface_jerk)) + ((ConfigOptionFloat, initial_layer_jerk)) + ((ConfigOptionFloat, travel_jerk)) + ) // This object is mapped to Perl as Slic3r::Config::PrintRegion. @@ -1027,7 +1046,6 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionEnum,print_sequence)) ((ConfigOptionInts, first_layer_print_sequence)) ((ConfigOptionBools, slow_down_for_layer_cooling)) - ((ConfigOptionFloat, default_acceleration)) ((ConfigOptionInts, close_fan_the_first_x_layers)) ((ConfigOptionEnum, draft_shield)) ((ConfigOptionFloat, extruder_clearance_height_to_rod))//BBs @@ -1038,27 +1056,12 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionBools, reduce_fan_stop_start_freq)) ((ConfigOptionFloats, fan_cooling_layer_time)) ((ConfigOptionStrings, filament_colour)) - ((ConfigOptionFloat, outer_wall_acceleration)) - ((ConfigOptionFloat, inner_wall_acceleration)) - ((ConfigOptionFloat, top_surface_acceleration)) - ((ConfigOptionFloat, initial_layer_acceleration)) - ((ConfigOptionFloatOrPercent, bridge_acceleration)) - ((ConfigOptionFloat, travel_acceleration)) - ((ConfigOptionFloatOrPercent, sparse_infill_acceleration)) ((ConfigOptionBools, activate_air_filtration)) ((ConfigOptionInts, during_print_exhaust_fan_speed)) ((ConfigOptionInts, complete_print_exhaust_fan_speed)) - ((ConfigOptionFloatOrPercent, internal_solid_infill_acceleration)) ((ConfigOptionFloatOrPercent, initial_layer_line_width)) ((ConfigOptionFloat, initial_layer_print_height)) ((ConfigOptionFloat, initial_layer_speed)) - ((ConfigOptionFloat, default_jerk)) - ((ConfigOptionFloat, outer_wall_jerk)) - ((ConfigOptionFloat, inner_wall_jerk)) - ((ConfigOptionFloat, infill_jerk)) - ((ConfigOptionFloat, top_surface_jerk)) - ((ConfigOptionFloat, initial_layer_jerk)) - ((ConfigOptionFloat, travel_jerk)) //BBS ((ConfigOptionFloat, initial_layer_infill_speed)) diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 00326dc2ab..b1dba25c64 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -683,7 +683,7 @@ void PrintObject::estimate_curled_extrusions() // Estimate curling of support material and add it to the malformaition lines of each layer float support_flow_width = support_material_flow(this, this->config().layer_height).width(); SupportSpotsGenerator::Params params{this->print()->m_config.filament_type.values, - float(this->print()->m_config.inner_wall_acceleration.getFloat()), + float(this->print()->default_object_config().inner_wall_acceleration.getFloat()), this->config().raft_layers.getInt(), this->config().brim_type.value, float(this->config().brim_width.getFloat())}; SupportSpotsGenerator::estimate_malformations(this->layers(), params);