From 99a090b83c480d0dc6c368d14b0a932f2b6dbbd1 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 8 Mar 2024 23:38:46 +0800 Subject: [PATCH] Improve PA tower: 1. support large nozzles 2. remove jerk=1 settings 3. move settings changes to object to avoid accidently saving the profile (#4382) Improve PA tower: 1. support large nozzles 2. remove jerk=1 settings --- .../pressure_advance/tower_with_seam.stl | Bin 30284 -> 1084 bytes src/slic3r/GUI/Plater.cpp | 27 +++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/resources/calib/pressure_advance/tower_with_seam.stl b/resources/calib/pressure_advance/tower_with_seam.stl index 325ffb1d70bfb844b501de354404901a2ddc6272..7e14536c7d6cc6c7e5edbbb4d8a123aa1a1248b8 100644 GIT binary patch literal 1084 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"nozzle_diameter")->get_at(0); filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats{ 1.0f }); - print_config->set_key_value("alternate_extra_wall", new ConfigOptionBool(false)); - print_config->set_key_value("default_jerk", new ConfigOptionFloat(1.0f)); - print_config->set_key_value("outer_wall_jerk", new ConfigOptionFloat(1.0f)); - print_config->set_key_value("inner_wall_jerk", new ConfigOptionFloat(1.0f)); + + + auto& obj_cfg = model().objects[0]->config; + + obj_cfg.set_key_value("alternate_extra_wall", new ConfigOptionBool(false)); auto full_config = wxGetApp().preset_bundle->full_config(); auto wall_speed = CalibPressureAdvance::find_optimal_PA_speed( full_config, full_config.get_abs_value("line_width", nozzle_diameter), full_config.get_abs_value("layer_height"), 0); - print_config->set_key_value("outer_wall_speed", new ConfigOptionFloat(wall_speed)); - print_config->set_key_value("inner_wall_speed", new ConfigOptionFloat(wall_speed)); - // print_config->set_key_value("wall_generator", new ConfigOptionEnum(PerimeterGeneratorType::Classic)); - const auto _wall_generator = print_config->option>("wall_generator"); - if (_wall_generator->value == PerimeterGeneratorType::Arachne) - print_config->set_key_value("wall_transition_angle", new ConfigOptionFloat(25)); - model().objects[0]->config.set_key_value("seam_position", new ConfigOptionEnum(spRear)); + obj_cfg.set_key_value("outer_wall_speed", new ConfigOptionFloat(wall_speed)); + obj_cfg.set_key_value("inner_wall_speed", new ConfigOptionFloat(wall_speed)); + obj_cfg.set_key_value("seam_position", new ConfigOptionEnum(spRear)); + obj_cfg.set_key_value("wall_loops", new ConfigOptionInt(2)); + obj_cfg.set_key_value("top_shell_layers", new ConfigOptionInt(0)); + obj_cfg.set_key_value("bottom_shell_layers", new ConfigOptionInt(0)); + obj_cfg.set_key_value("sparse_infill_density", new ConfigOptionPercent(0)); + obj_cfg.set_key_value("brim_type", new ConfigOptionEnum(btEar)); + obj_cfg.set_key_value("brim_object_gap", new ConfigOptionFloat(.0f)); + obj_cfg.set_key_value("brim_ears_max_angle", new ConfigOptionFloat(135.f)); + obj_cfg.set_key_value("brim_width", new ConfigOptionFloat(6.f)); changed_objects({ 0 }); wxGetApp().get_tab(Preset::TYPE_PRINT)->update_dirty();