fix extruder_clearance_radius

#620

resources/profiles/BBL.json

@@ -1,7 +1,7 @@
 {
     "name": "Bambulab",
     "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
-    "version": "01.06.00.00",
+    "version": "01.06.00.01",
     "force_update": "0",
     "description": "the initial version of BBL configurations",
     "machine_model_list": [

resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json

@@ -110,8 +110,7 @@
         "0.08"
     ],
     "printable_height": "250",
-    "extruder_clearance_radius": "57",
+    "extruder_clearance_radius": "68",
-    "extruder_clearance_max_radius": "68",
     "extruder_clearance_height_to_rod": "36",
     "extruder_clearance_height_to_lid": "90",
     "nozzle_volume": "107",

src/libslic3r/Preset.cpp

@@ -796,7 +796,7 @@ static std::vector<std::string> s_Preset_printer_options {
     "printer_technology",
     "printable_area", "bed_exclude_area","bed_custom_texture", "bed_custom_model", "gcode_flavor",
     "single_extruder_multi_material", "machine_start_gcode", "machine_end_gcode", "before_layer_change_gcode", "layer_change_gcode", "change_filament_gcode",
-    "printer_model", "printer_variant", "printable_height", "extruder_clearance_radius",  "extruder_clearance_max_radius","extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod",
+    "printer_model", "printer_variant", "printable_height", "extruder_clearance_radius", "extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod",
     "default_print_profile", "inherits",
     "silent_mode",
     // BBS

src/libslic3r/Print.cpp

@@ -88,7 +88,6 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
         "extruder_clearance_height_to_rod",
         "extruder_clearance_height_to_lid",
         "extruder_clearance_radius",
-        "extruder_clearance_max_radius",
         "extruder_colour",
         "extruder_offset",
         "filament_flow_ratio",
@@ -492,7 +491,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
                 convex_hull = offset(convex_hull_no_offset,
                         // Shrink the extruder_clearance_radius a tiny bit, so that if the object arrangement algorithm placed the objects
                         // exactly by satisfying the extruder_clearance_radius, this test will not trigger collision.
-                        float(scale_(0.5 * print.config().extruder_clearance_max_radius.value - EPSILON)),
+                        float(scale_(0.5 * print.config().extruder_clearance_radius.value - EPSILON)),
                         jtRound, scale_(0.1)).front();
                 // instance.shift is a position of a centered object, while model object may not be centered.
                 // Convert the shift from the PrintObject's coordinates into ModelObject's coordinates by removing the centering offset.

src/libslic3r/PrintConfig.cpp

@@ -1146,14 +1146,6 @@ void PrintConfigDef::init_fff_params()
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloat(40));
 
-    def           = this->add("extruder_clearance_max_radius", coFloat);
-    def->label    = L("Max Radius");
-    def->tooltip  = L("Max clearance radius around extruder. Used for collision avoidance in by-object printing.");
-    def->sidetext = L("mm");
-    def->min      = 0;
-    def->mode     = comAdvanced;
-    def->set_default_value(new ConfigOptionFloat(68));
-
     def = this->add("extruder_colour", coStrings);
     def->label = L("Extruder Color");
     def->tooltip = L("Only used as a visual help on UI");

src/libslic3r/PrintConfig.hpp

@@ -918,7 +918,6 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
     ((ConfigOptionFloat,              extruder_clearance_height_to_rod))//BBs
     ((ConfigOptionFloat,              extruder_clearance_height_to_lid))//BBS
     ((ConfigOptionFloat,              extruder_clearance_radius))
-    ((ConfigOptionFloat,              extruder_clearance_max_radius))
     ((ConfigOptionStrings,            extruder_colour))
     ((ConfigOptionPoints,             extruder_offset))
     ((ConfigOptionBools,              reduce_fan_stop_start_freq))

src/slic3r/GUI/GLCanvas3D.cpp

@@ -4971,7 +4971,7 @@ void GLCanvas3D::update_sequential_clearance()
     // the results are then cached for following displacements
     if (m_sequential_print_clearance_first_displacement) {
         m_sequential_print_clearance.m_hull_2d_cache.clear();
-        float shrink_factor = static_cast<float>(scale_(0.5 * fff_print()->config().extruder_clearance_max_radius.value - EPSILON));
+        float shrink_factor = static_cast<float>(scale_(0.5 * fff_print()->config().extruder_clearance_radius.value - EPSILON));
         double mitter_limit = scale_(0.1);
         m_sequential_print_clearance.m_hull_2d_cache.reserve(m_model->objects.size());
         for (size_t i = 0; i < m_model->objects.size(); ++i) {

src/slic3r/GUI/Jobs/ArrangeJob.cpp

@@ -389,7 +389,7 @@ void ArrangeJob::prepare()
 
         params.clearance_height_to_rod             = print.config().extruder_clearance_height_to_rod.value;
         params.clearance_height_to_lid             = print.config().extruder_clearance_height_to_lid.value;
-        params.cleareance_radius                   = print.config().extruder_clearance_max_radius.value;
+        params.cleareance_radius                   = print.config().extruder_clearance_radius.value;
         params.printable_height                    = print.config().printable_height.value;
         params.allow_rotations                     = settings.enable_rotation;
         params.allow_multi_materials_on_same_plate = settings.allow_multi_materials_on_same_plate;

src/slic3r/GUI/Plater.cpp

@@ -2217,8 +2217,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     //BBS: add bed_exclude_area
     , config(Slic3r::DynamicPrintConfig::new_from_defaults_keys({
         "printable_area", "bed_exclude_area", "bed_custom_texture", "bed_custom_model", "print_sequence",
-        "extruder_clearance_radius", "extruder_clearance_max_radius",
+        "extruder_clearance_radius", "extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", "skirt_loops", "skirt_distance",
-        "extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", "skirt_loops", "skirt_distance",
         "brim_width", "brim_object_gap", "brim_type", "nozzle_diameter", "single_extruder_multi_material",
         "enable_prime_tower", "wipe_tower_x", "wipe_tower_y", "prime_tower_width", "prime_tower_brim_width", "prime_volume",
         "extruder_colour", "filament_colour", "material_colour", "printable_height", "printer_model", "printer_technology",