PA per filament

# Conflicts:
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	version.inc

bbl/i18n/zh_cn/BambuStudio_zh_CN.po

@@ -4810,6 +4810,12 @@ msgstr "桥接"
 msgid "Gap infill"
 msgstr "填缝"
 
+msgid "Filter out tiny gaps"
+msgstr "忽略微小间隙"
+
+msgid "Filter out gaps smaller than the threshold specified. This setting won't affact top/bottom layers"
+msgstr "小于指定阈值的微小间隙不填充。本设置不会对顶/底层起作用"
+
 msgid "Support interface"
 msgstr "支撑面"
 

resources/profiles/Anycubic.json

@@ -1,6 +1,6 @@
 {
     "name": "Anycubic",
-    "version": "01.02.00.04",
+    "version": "01.02.00.05",
     "force_update": "0",
     "description": "Anycubic configurations",
     "machine_model_list": [

resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json

@@ -20,7 +20,7 @@
       "0x205"
     ],
     "printable_height": "200",
-    "machine_start_gcode": ";M190 S0\n;M104 S0\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n; You can use following code instead if your PRINT_START macro support Chamber and print area bedmesh\n; PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single] Chamber=[chamber_temperature] PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}",
+    "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n; You can use following code instead if your PRINT_START macro support Chamber and print area bedmesh\n; PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single] Chamber=[chamber_temperature] PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}",
     "machine_end_gcode": "PRINT_END",
     "layer_change_gcode": "",
     "scan_first_layer": "0",

resources/profiles/BBL.json

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

resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json

@@ -111,9 +111,10 @@
         "0.08"
     ],
     "printable_height": "250",
-    "extruder_clearance_radius": "32",
+    "extruder_clearance_radius": "57",
+    "extruder_clearance_max_radius": "68",
     "extruder_clearance_height_to_rod": "36",
-    "extruder_clearance_height_to_lid": "140",
+    "extruder_clearance_height_to_lid": "90",
     "nozzle_volume": "118",
     "nozzle_diameter": [
         "0.4"

resources/profiles/Voron.json

@@ -1,6 +1,6 @@
 {
     "name": "Voron",
-    "version": "01.02.01.05",
+    "version": "01.02.01.06",
     "force_update": "0",
     "description": "Voron configurations",
     "machine_model_list": [

resources/profiles/Voron/machine/fdm_klipper_common.json

@@ -131,7 +131,7 @@
   "bed_exclude_area": [
     "0x0"
   ],
-  "machine_start_gcode": ";M190 S0\n;M104 S0\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n; You can use following code instead if your PRINT_START macro support Chamber and print area bedmesh\n; PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single] Chamber=[chamber_temperature] PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}",
+  "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n; You can use following code instead if your PRINT_START macro support Chamber and print area bedmesh\n; PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single] Chamber=[chamber_temperature] PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}",
   "machine_end_gcode": "PRINT_END",
   "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
   "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",

src/libnest2d/include/libnest2d/selections/firstfit.hpp

@@ -84,6 +84,15 @@ public:
 
         std::sort(store_.begin(), store_.end(), sortfunc);
 
+        // debug: write down intitial order
+        for (auto it = store_.begin(); it != store_.end(); ++it) {
+            std::stringstream ss;
+            ss << "initial order: " << it->get().name << ", p=" << it->get().priority() << ", bed_temp=" << it->get().bed_temp << ", height=" << it->get().height
+               << ", area=" << it->get().area();
+            if (this->unfitindicator_)
+                this->unfitindicator_(ss.str());
+        }
+
         int item_id = 0;
         auto makeProgress = [this, &item_id](Placer &placer, size_t bin_idx) {
             packed_bins_[bin_idx] = placer.getItems();
@@ -102,7 +111,7 @@ public:
             bool was_packed = false;
             int best_bed_id = -1;
             int bed_id_firstfit = -1;
-            double score = LARGE_COST_TO_REJECT, best_score = LARGE_COST_TO_REJECT;
+            double score = LARGE_COST_TO_REJECT+1, best_score = LARGE_COST_TO_REJECT+1;
             double score_all_plates = 0, score_all_plates_best = std::numeric_limits<double>::max();
             typename Placer::PackResult result, result_best, result_firstfit;
             size_t j = 0;
@@ -130,8 +139,8 @@ public:
                     // item is not fit because we have tried all possible plates to find a good enough fit
                     if (bed_id_firstfit == MAX_NUM_PLATES) {
                         it->get().binId(BIN_ID_UNFIT);
-                        //if (this->unfitindicator_)
-                        //    this->unfitindicator_(it->get().name + " bed_id_firstfit == MAX_NUM_PLATES" + ",best_score=" + std::to_string(best_score));
+                        if (this->unfitindicator_)
+                            this->unfitindicator_(it->get().name + " bed_id_firstfit == MAX_NUM_PLATES" + ",best_score=" + std::to_string(best_score));
                         break;
                     }
                     else {
@@ -152,10 +161,13 @@ public:
                 }
 
                 if(!was_packed){
-                    //if (this->unfitindicator_)
-                    //    this->unfitindicator_(it->get().name + " ,plate_id=" + std::to_string(j) + ",score=" + std::to_string(score)
-                    //        + ", score_all_plates=" + std::to_string(score_all_plates)
-                    //        + ", overfit=" + std::to_string(result.overfit()));
+                    if (this->unfitindicator_ && !placers.empty())
+                        this->unfitindicator_(it->get().name + ", height=" +std::to_string(it->get().height)
+                            + " ,plate_id=" + std::to_string(j-1)
+                            + ", score=" + std::to_string(score)
+                            + ", best_bed_id=" + std::to_string(best_bed_id)
+                            + ", score_all_plates=" + std::to_string(score_all_plates)
+                            +", overfit=" + std::to_string(result.overfit()));
 
                     placers.emplace_back(bin);
                     placers.back().plateID(placers.size() - 1);

src/libslic3r/AppConfig.cpp

@@ -533,8 +533,10 @@ void AppConfig::save()
     {
         // Returns "undefined" if the thread naming functionality is not supported by the operating system.
         std::optional<std::string> current_thread_name = get_current_thread_name();
-        if (current_thread_name && *current_thread_name != "bambustu_main")
-            throw CriticalException("Calling AppConfig::save() from a worker thread!");
+        if (current_thread_name && *current_thread_name != "bambustu_main") {
+            BOOST_LOG_TRIVIAL(error) << __FUNCTION__<<", current_thread_name is " << *current_thread_name;
+            throw CriticalException("Calling AppConfig::save() from a worker thread, thread name: " + *current_thread_name);
+        }
     }
 
     // The config is first written to a file with a PID suffix and then moved

src/libslic3r/Arrange.cpp

@@ -404,8 +404,8 @@ protected:
                 hasLidHeightConflict |= (p.height > clearance_height_to_lid);
             }
 
-            double lambda3 = LARGE_COST_TO_REJECT;
-            double lambda4 = LARGE_COST_TO_REJECT;
+            double lambda3 = LARGE_COST_TO_REJECT*1.1;
+            double lambda4 = LARGE_COST_TO_REJECT*1.2;
             for (int i = 0; i < m_items.size(); i++) {
                 Item& p = m_items[i];
                 if (p.is_virt_object) continue;
@@ -556,12 +556,11 @@ public:
                     }
                 });
 
-        //if (progressind) {
-        //    m_pck.unfitIndicator([this, progressind](std::string name) {
-        //        progressind(100, name+" not fit!");
-        //        BOOST_LOG_TRIVIAL(debug) << "arrange not fit: " + name;
-        //        });
-        //}
+        if (progressind) {
+            m_pck.unfitIndicator([this, progressind](std::string name) {
+                BOOST_LOG_TRIVIAL(debug) << "arrange not fit: " + name;
+                });
+        }
 
         if (stopcond) m_pck.stopCondition(stopcond);
 

src/libslic3r/Arrange.hpp

@@ -52,6 +52,7 @@ struct ArrangePolygon {
     //BBS: add locked_plate to indicate whether it is in the locked plate
     int       locked_plate{ -1 };
     bool      is_virt_object{ false };
+    bool      is_extrusion_cali_object{ false };
     bool      is_wipe_tower{false};
     //BBS: add row/col for sudoku-style layout
     int       row{0};

src/libslic3r/Fill/Fill.cpp

@@ -467,8 +467,9 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
 		params.no_extrusion_overlap = surface_fill.params.overlap;
 
 		LayerRegion* layerm = this->m_regions[surface_fill.region_id];
+		params.config = &layerm->region().config();
 		for (ExPolygon& expoly : surface_fill.expolygons) {
-			f->no_overlap_expolygons = intersection_ex(layerm->fill_no_overlap_expolygons, ExPolygons() = { expoly });
+			f->no_overlap_expolygons = intersection_ex(surface_fill.no_overlap_expolygons, ExPolygons() = {expoly});
 			// Spacing is modified by the filler to indicate adjustments. Reset it for each expolygon.
 			f->spacing = surface_fill.params.spacing;
 			surface_fill.surface.expolygon = std::move(expoly);

src/libslic3r/Fill/FillBase.hpp

@@ -74,6 +74,8 @@ struct FillParams
     bool            using_internal_flow{ false };
     //BBS: only used for new top surface pattern
     float           no_extrusion_overlap{ 0.0 };
+    const           PrintRegionConfig* config{ nullptr };
+
 };
 static_assert(IsTriviallyCopyable<FillParams>::value, "FillParams class is not POD (and it should be - see constructor).");
 

src/libslic3r/Fill/FillRectilinear.cpp

@@ -3169,9 +3169,17 @@ void FillMonotonicLineWGapFill::fill_surface_extrusion(const Surface* surface, c
         }
 
         if (!polylines.empty() && !is_bridge(params.extrusion_role)) {
+            if (!surface->is_top() && !surface->is_bottom()) {
+                polylines.erase(std::remove_if(polylines.begin(), polylines.end(),
+                    [&](const ThickPolyline& p) {
+                        return p.length() < scale_(params.config->filter_out_gap_fill.value);
+                    }), polylines.end());
+            }
+
             ExtrusionEntityCollection gap_fill;
             variable_width(polylines, erGapFill, params.flow, gap_fill.entities);
             coll_nosort->append(std::move(gap_fill.entities));
+
         }
     }
 

src/libslic3r/GCode.cpp

@@ -435,6 +435,11 @@ bool GCode::gcode_label_objects = true;
         gcode += tcr_gcode;
         check_add_eol(toolchange_gcode_str);
 
+        //SoftFever: set new PA for new filament
+        if (gcodegen.config().enable_pressure_advance.get_at(new_extruder_id)) {
+            gcode += gcodegen.writer().set_pressure_advance(gcodegen.config().pressure_advance.get_at(new_extruder_id));
+        }
+
         // A phony move to the end position at the wipe tower.
         gcodegen.writer().travel_to_xy(end_pos.cast<double>());
         gcodegen.set_last_pos(wipe_tower_point_to_object_point(gcodegen, end_pos + plate_origin_2d));
@@ -1641,19 +1646,6 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
     if (is_bbl_printers) {
       // if (print.config().spaghetti_detector.value)
       file.write("M981 S1 P20000 ;open spaghetti detector\n");
-      file.write_format("M900 K%.3f M%0.3f ; Override pressure advance value\n",
-                        m_config.pressure_advance.values.front(),
-                        outer_wall_volumetric_speed / (1.75 * 1.75 / 4 * 3.14) *
-                            m_config.pressure_advance.values.front());
-    } else {
-      if (m_config.enable_pressure_advance.value) {
-        if(print.config().gcode_flavor.value == gcfKlipper)
-            file.write_format("SET_PRESSURE_ADVANCE ADVANCE=%.3f ; Override pressure advance value\n",
-                          m_config.pressure_advance.values.front());
-        else
-            file.write_format("M900 K%.3f ; Override pressure advance value\n",
-                          m_config.pressure_advance.values.front());
-      }
     }
 
     // Do all objects for each layer.
@@ -4226,6 +4218,10 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z)
     if (m_ooze_prevention.enable)
         gcode += m_ooze_prevention.post_toolchange(*this);
 
+    if (m_config.enable_pressure_advance.get_at(extruder_id)) {
+        gcode += m_writer.set_pressure_advance(m_config.pressure_advance.get_at(extruder_id));
+    }
+
     return gcode;
 }
 

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -4058,18 +4058,21 @@ void GCodeProcessor::update_slice_warnings()
 
     auto used_extruders = get_used_extruders();
     assert(!used_extruders.empty());
+    GCodeProcessorResult::SliceWarning warning;
+    warning.level = 1;
     if (m_highest_bed_temp != 0) {
         for (size_t i = 0; i < used_extruders.size(); i++) {
             int temperature = get_filament_vitrification_temperature(used_extruders[i]);
-            if (temperature != 0 && m_highest_bed_temp > temperature) {
-                GCodeProcessorResult::SliceWarning warning;
-                warning.level = 1;
-                warning.msg = BED_TEMP_TOO_HIGH_THAN_FILAMENT;
-                m_result.warnings.emplace_back(std::move(warning));
-            }
+            if (temperature != 0 && m_highest_bed_temp > temperature)
+                warning.params.push_back(std::to_string(used_extruders[i]));
         }
     }
 
+    if (!warning.params.empty()) {
+        warning.msg   = BED_TEMP_TOO_HIGH_THAN_FILAMENT;
+        m_result.warnings.push_back(warning);
+    }
+
     m_result.warnings.shrink_to_fit();
 }
 

src/libslic3r/GCodeWriter.cpp

@@ -209,6 +209,22 @@ std::string GCodeWriter::set_jerk_xy(unsigned int jerk)
 
 }
 
+std::string GCodeWriter::set_pressure_advance(double pa) const
+{
+    std::ostringstream gcode;
+    if (pa < 0)
+        return gcode.str();
+
+    if (FLAVOR_IS(gcfKlipper))
+        gcode << "SET_PRESSURE_ADVANCE ADVANCE=" << std::setprecision(4) << pa << "; Override pressure advance value\n";
+    else
+        gcode << "M900 K" <<std::setprecision(4)<< pa << "; Override pressure advance value\n";
+
+    return gcode.str();
+}
+
+
+
 std::string GCodeWriter::reset_e(bool force)
 {
     if (FLAVOR_IS(gcfMach3)

src/libslic3r/GCodeWriter.hpp

@@ -47,6 +47,7 @@ public:
     std::string set_bed_temperature(std::vector<int> temps_per_bed, int default_temp, bool wait = false);
     std::string set_acceleration(unsigned int acceleration);
     std::string set_jerk_xy(unsigned int jerk);
+    std::string set_pressure_advance(double pa) const;
     std::string reset_e(bool force = false);
     std::string update_progress(unsigned int num, unsigned int tot, bool allow_100 = false) const;
     // return false if this extruder was already selected

src/libslic3r/Layer.cpp

@@ -171,7 +171,8 @@ void Layer::make_perimeters()
 		                && config.inner_wall_speed             == other_config.inner_wall_speed
 		                && config.outer_wall_speed    == other_config.outer_wall_speed
 		                && config.small_perimeter_speed    == other_config.small_perimeter_speed
-		                && config.gap_infill_speed.value == other_config.gap_infill_speed.value
+                        && config.gap_infill_speed.value == other_config.gap_infill_speed.value
+                        && config.filter_out_gap_fill.value == other_config.filter_out_gap_fill.value
 		                && config.detect_overhang_wall                   == other_config.detect_overhang_wall
 		                && config.opt_serialize("inner_wall_line_width") == other_config.opt_serialize("inner_wall_line_width")
 		                && config.detect_thin_wall                  == other_config.detect_thin_wall

src/libslic3r/ModelArrange.cpp

@@ -127,11 +127,11 @@ ArrangePolygon get_instance_arrange_poly(ModelInstance* instance, const Slic3r::
 
         const ConfigOptionInts* bed_opt = config.option<ConfigOptionInts>(get_bed_temp_key(curr_bed_type));
         if (bed_opt != nullptr)
-            ap.bed_temp = bed_opt->get_at(ap.extrude_ids.back());
+            ap.bed_temp = bed_opt->get_at(ap.extrude_ids.back()-1);
 
         const ConfigOptionInts* bed_opt_1st_layer = config.option<ConfigOptionInts>(get_bed_temp_1st_layer_key(curr_bed_type));
         if (bed_opt_1st_layer != nullptr)
-            ap.first_bed_temp = bed_opt_1st_layer->get_at(ap.extrude_ids.back());
+            ap.first_bed_temp = bed_opt_1st_layer->get_at(ap.extrude_ids.back()-1);
     }
 
     if (config.has("nozzle_temperature")) //get the print temperature

src/libslic3r/PerimeterGenerator.cpp

@@ -715,6 +715,15 @@ void PerimeterGenerator::process()
                 ++ irun;
             }
 #endif
+            // SoftFever: don't filter out tiny gap fills for first and top layer. So that the print looks better :)
+            if (this->layer_id != 0 && this->upper_slices != nullptr)
+            {
+                polylines.erase(std::remove_if(polylines.begin(), polylines.end(),
+                    [&](const ThickPolyline& p) {
+                        return p.length() < scale_(config->filter_out_gap_fill.value);
+                    }), polylines.end());
+            }
+
 
             if (! polylines.empty()) {
 				ExtrusionEntityCollection gap_fill;
@@ -728,7 +737,8 @@ void PerimeterGenerator::process()
                 //FIXME Vojtech: This grows by a rounded extrusion width, not by line spacing,
                 // therefore it may cover the area, but no the volume.
                 last = diff_ex(last, gap_fill.polygons_covered_by_width(10.f));
-				this->gap_fill->append(std::move(gap_fill.entities));
+                this->gap_fill->append(std::move(gap_fill.entities));
+
 			}
         }
 

src/libslic3r/Preset.cpp

@@ -346,6 +346,7 @@ void Preset::normalize(DynamicPrintConfig &config)
         }
     }
 
+
     handle_legacy_sla(config);
 }
 
@@ -697,7 +698,7 @@ static std::vector<std::string> s_Preset_print_options {
 #endif /* HAS_PRESSURE_EQUALIZER */
     "inner_wall_speed", "outer_wall_speed", "small_perimeter_speed", "small_perimeter_threshold", "sparse_infill_speed", "internal_solid_infill_speed",
     "top_surface_speed", "support_speed", "support_object_xy_distance", "support_interface_speed",
-    "bridge_speed", "bridge_angle", "gap_infill_speed", "travel_speed", "travel_speed_z", "initial_layer_speed",
+    "bridge_speed", "bridge_angle", "filter_out_gap_fill", "gap_infill_speed", "travel_speed", "travel_speed_z", "initial_layer_speed",
     "outer_wall_acceleration", "inner_wall_acceleration", "initial_layer_acceleration", "top_surface_acceleration", "default_acceleration", "travel_acceleration", "skirt_loops", "skirt_distance", "skirt_height", "draft_shield",
     "default_jerk", "outer_wall_jerk", "inner_wall_jerk", "top_surface_jerk", "initial_layer_jerk","travel_jerk",
     "brim_width", "brim_object_gap", "brim_type", "enable_support", "support_type", "support_threshold_angle", "enforce_support_layers",
@@ -763,7 +764,7 @@ static std::vector<std::string> s_Preset_printer_options {
     "printer_technology",
     "printable_area", "bed_exclude_area", "gcode_flavor","z_lift_type",
     "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_height_to_lid", "extruder_clearance_height_to_rod",
+    "printer_model", "printer_variant", "printable_height", "extruder_clearance_radius",  "extruder_clearance_max_radius","extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod",
     "default_print_profile", "inherits",
     "silent_mode",
     // BBS

src/libslic3r/Print.cpp

@@ -82,6 +82,7 @@ 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",
@@ -398,6 +399,9 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
         const PrintInstance *print_instance;
         BoundingBox    bounding_box;
         Polygon        hull_polygon;
+        int                  index;
+        double         arrange_score;
+        double               height;
     };
     std::vector<struct print_instance_info> print_instance_with_bounding_box;
     {
@@ -475,6 +479,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
                     }
                 }
                 struct print_instance_info print_info {&instance, convex_hull.bounding_box(), convex_hull};
+                print_info.height = instance.print_object->height();
                 print_instance_with_bounding_box.push_back(std::move(print_info));
                 convex_hulls_other.emplace_back(std::move(convex_hull));
             }
@@ -489,22 +494,104 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
         }
     }
 
-    //sort the print instance
+    // calc sort order
+    double hc1              = scale_(print.config().extruder_clearance_height_to_lid); // height to lid
+    double hc2              = scale_(print.config().extruder_clearance_height_to_rod); // height to rod
+    double printable_height = scale_(print.config().printable_height);
+
+    auto bed_points = get_bed_shape(print_config);
+    float bed_width = bed_points[1].x() - bed_points[0].x();
+    // 如果扩大以后的多边形的距离小于这个值，就需要严格保证从左到右的打印顺序，否则会撞工具头右侧
+    float unsafe_dist = scale_(print_config.extruder_clearance_max_radius.value - print_config.extruder_clearance_radius.value);
+    struct VecHash
+    {
+        size_t operator()(const Vec2i &n1) const
+        {
+            return std::hash<coord_t>()(int(n1(0) * 100 + 100)) + std::hash<coord_t>()(int(n1(1) * 100 + 100)) * 101;
+        }
+    };
+    std::unordered_set<Vec2i, VecHash> left_right_pair; // pairs in this vector must strictly obey the left-right order
+    for (size_t i = 0; i < print_instance_with_bounding_box.size();i++) { 
+        auto &inst         = print_instance_with_bounding_box[i];
+        inst.index         = i;
+        Point pt           = inst.bounding_box.center();
+        inst.arrange_score = pt.x() / 2 + pt.y(); // we prefer print row-by-row, so cost on x-direction is smaller
+    }
+    for (size_t i = 0; i < print_instance_with_bounding_box.size(); i++) {
+        auto &inst         = print_instance_with_bounding_box[i];        
+        auto &l            = print_instance_with_bounding_box[i];
+        for (size_t j = 0; j < print_instance_with_bounding_box.size(); j++) {
+            if (j != i) { 
+                auto &r        = print_instance_with_bounding_box[j];
+                auto ly1       = l.bounding_box.min.y();
+                auto ly2       = l.bounding_box.max.y();
+                auto ry1       = r.bounding_box.min.y();
+                auto ry2       = r.bounding_box.max.y();
+                auto lx1       = l.bounding_box.min.x();
+                auto rx1       = r.bounding_box.min.x();
+                auto lx2       = l.bounding_box.max.x();
+                auto rx2       = r.bounding_box.max.x();
+                auto inter_min = std::max(ly1, ry1);
+                auto inter_max = std::min(ly2, ry2);
+                auto inter_y   = inter_max - inter_min;
+                inter_min      = std::max(lx1, rx1);
+                inter_max      = std::min(lx2, rx2);
+                auto inter_x   = inter_max - inter_min;
+
+                // 如果y方向的重合超过轮廓的膨胀量，说明两个物体在一行，应该先打左边的物体，即先比较二者的x坐标。
+                if (inter_y > scale_(1)) {
+                    if (std::max(rx1 - lx2, lx1 - rx2) < unsafe_dist) {
+                        if (lx1 > rx1) {
+                            left_right_pair.insert({j, i});
+                            BOOST_LOG_TRIVIAL(debug) << "in-a-row, print_instance " << r.print_instance->model_instance->get_object()->name << "(" << r.arrange_score << ")"
+                                                     << " -> " << l.print_instance->model_instance->get_object()->name << "(" << l.arrange_score << ")";
+                        } else {
+                            left_right_pair.insert({i, j});
+                            BOOST_LOG_TRIVIAL(debug) << "in-a-row, print_instance " << l.print_instance->model_instance->get_object()->name << "(" << l.arrange_score << ")"
+                                                     << " -> " << r.print_instance->model_instance->get_object()->name << "(" << r.arrange_score << ")";
+                        }
+                    }
+                } 
+                if (l.height > hc1 && r.height < hc1) {
+                    // 当前物体超过了顶盖高度，必须后打
+                    left_right_pair.insert({j, i});
+                    BOOST_LOG_TRIVIAL(debug) << "height>hc1, print_instance " << r.print_instance->model_instance->get_object()->name << "(" << r.arrange_score << ")"
+                                             << " -> " << l.print_instance->model_instance->get_object()->name << "(" << l.arrange_score << ")";
+                }
+                else if (l.height > hc2 && l.height > r.height && l.arrange_score<r.arrange_score) {
+                    // 如果当前物体的高度超过滑杆，且比r高，就给它加一点代价，尽量让高的物体后打（只有物体高度超过滑杆时才有必要按高度来）
+                    l.arrange_score = std::max(l.arrange_score, r.arrange_score + bed_width/2);
+                    BOOST_LOG_TRIVIAL(debug) << "height>hc2, print_instance " << inst.print_instance->model_instance->get_object()->name
+                                             << ", right=" << r.print_instance->model_instance->get_object()->name << ", l.score: " << l.arrange_score
+                                             << ", r.score: " << r.arrange_score;
+                }
+            }
+        }
+    }
+    BOOST_LOG_TRIVIAL(debug) << "bed width: " << bed_width << ", unsafe_dist:" << unsafe_dist;
+    // 多做几次代价传播，因为前一次有些值没有更新。
+    // TODO 更好的办法是建立一颗树，一步到位。不过我暂时没精力搞，先就这样吧
+    for (int k=0;k<5;k++)
+    for (auto p : left_right_pair) {
+        auto &l = print_instance_with_bounding_box[p(0)];
+        auto &r = print_instance_with_bounding_box[p(1)];
+        if(r.arrange_score<l.arrange_score)
+            r.arrange_score = l.arrange_score + bed_width/2;
+    }
+    
+    for (auto p : left_right_pair) {
+        auto &l         = print_instance_with_bounding_box[p(0)];
+        auto &r         = print_instance_with_bounding_box[p(1)];
+        BOOST_LOG_TRIVIAL(debug) << "print_instance " << l.print_instance->model_instance->get_object()->name << "(" << l.arrange_score << ")"
+                                 << " -> " << r.print_instance->model_instance->get_object()->name << "(" << r.arrange_score << ")";
+    }
+    // sort the print instance
     std::sort(print_instance_with_bounding_box.begin(), print_instance_with_bounding_box.end(),
-        [](auto &l, auto &r) {
-            auto ly1       = l.bounding_box.min.y();
-            auto ly2       = l.bounding_box.max.y();
-            auto ry1       = r.bounding_box.min.y();
-            auto ry2       = r.bounding_box.max.y();
-            auto inter_min = std::max(ly1, ry1);
-            auto inter_max = std::min(ly2, ry2);
-            auto lx        = l.bounding_box.min.x();
-            auto rx        = r.bounding_box.min.x();
-            if (inter_max - inter_min > 0)
-                return (lx < rx) || ((lx == rx) && (ly1 < ry1));
-            else
-                return (ly1 < ry1);
-        });
+        [](print_instance_info& l, print_instance_info& r) {return l.arrange_score < r.arrange_score;});
+
+    for (auto &inst : print_instance_with_bounding_box)
+        BOOST_LOG_TRIVIAL(debug) << "after sorting print_instance " << inst.print_instance->model_instance->get_object()->name << ", score: " << inst.arrange_score
+                                 << ", height:"<< inst.height;
 
     // sequential_print_vertical_clearance_valid
     {
@@ -535,9 +622,6 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
                 break;
         }*/
 
-        double hc1 = scale_(print.config().extruder_clearance_height_to_lid);
-        double hc2 = scale_(print.config().extruder_clearance_height_to_rod);
-        double printable_height = scale_(print.config().printable_height);
 
         // if objects are not overlapped on y-axis, they will not collide even if they are taller than extruder_clearance_height_to_rod
         int print_instance_count = print_instance_with_bounding_box.size();
@@ -545,7 +629,8 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
         for (int k = 0; k < print_instance_count; k++)
         {
             auto inst = print_instance_with_bounding_box[k].print_instance;
-            auto bbox = print_instance_with_bounding_box[k].bounding_box;
+            // 只需要考虑喷嘴到滑杆的偏移量，这个比整个工具头的碰撞半径要小得多
+            auto bbox = print_instance_with_bounding_box[k].bounding_box.inflated(-scale_(0.5 * print.config().extruder_clearance_radius.value));
             auto iy1 = bbox.min.y();
             auto iy2 = bbox.max.y();
             (const_cast<ModelInstance*>(inst->model_instance))->arrange_order = k+1;

src/libslic3r/PrintConfig.cpp

@@ -1025,7 +1025,7 @@ void PrintConfigDef::init_fff_params()
     def = this->add("extruder_clearance_height_to_rod", coFloat);
     def->label = L("Height to rod");
     def->tooltip = L("Distance of the nozzle tip to the lower rod. "
-        "Used as input of auto-arranging to avoid collision when printing by object");
+        "Used for collision avoidance in by-object printing.");
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
@@ -1035,7 +1035,7 @@ void PrintConfigDef::init_fff_params()
     def = this->add("extruder_clearance_height_to_lid", coFloat);
     def->label = L("Height to lid");
     def->tooltip = L("Distance of the nozzle tip to the lid. "
-        "Used as input of auto-arranging to avoid collision when printing by object");
+        "Used for collision avoidance in by-object printing.");
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
@@ -1043,12 +1043,20 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("extruder_clearance_radius", coFloat);
     def->label = L("Radius");
-    def->tooltip = L("Clearance radius around extruder. Used as input of auto-arranging to avoid collision when printing by object");
+    def->tooltip = L("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(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");
@@ -1077,10 +1085,10 @@ void PrintConfigDef::init_fff_params()
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloats { 1. });
 
-    def = this->add("enable_pressure_advance", coBool);
+    def = this->add("enable_pressure_advance", coBools);
     def->label = L("Enable pressure advance");
     def->tooltip = L("Enable pressure advance, auto calibration result will be overwriten once enabled.");
-    def->set_default_value(new ConfigOptionBool(false));
+    def->set_default_value(new ConfigOptionBools{ false });
 
     def = this->add("pressure_advance", coFloats);
     def->label = L("Pressure advance");
@@ -1105,7 +1113,7 @@ void PrintConfigDef::init_fff_params()
                      "at minimum speed to reduce the frequency of starting and stoping");
     def->set_default_value(new ConfigOptionBools { false });
 
-    def = this->add("fan_cooling_layer_time", coInts);
+    def = this->add("fan_cooling_layer_time", coFloats);
     def->label = L("Layer time");
     def->tooltip = L("Part cooling fan will be enabled for layers of which estimated time is shorter than this value. "
                      "Fan speed is interpolated between the minimum and maximum fan speeds according to layer printing time");
@@ -1113,7 +1121,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 1000;
     def->mode = comSimple;
-    def->set_default_value(new ConfigOptionInts { 60 });
+    def->set_default_value(new ConfigOptionFloats{ 60.0f });
 
     def = this->add("filament_colour", coStrings);
     def->label = L("Color");
@@ -1488,6 +1496,13 @@ void PrintConfigDef::init_fff_params()
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionFloat(0.8));
 
+    def = this->add("filter_out_gap_fill", coFloat);
+    def->label = L("Filter out tiny gaps");
+    def->category = L("Layers and Perimeters");
+    def->tooltip = L("Filter out gaps smaller than the threshold specified. This setting won't affact top/bottom layers");
+    def->mode = comAdvanced;
+    def->set_default_value(new ConfigOptionFloat(0));
+    
     def = this->add("gap_infill_speed", coFloat);
     def->label = L("Gap infill");
     def->category = L("Speed");
@@ -2272,7 +2287,7 @@ void PrintConfigDef::init_fff_params()
     def->mode = comSimple;
     def->set_default_value(new ConfigOptionInt(1));
 
-    def = this->add("slow_down_layer_time", coInts);
+    def = this->add("slow_down_layer_time", coFloats);
     def->label = L("Layer time");
     def->tooltip = L("The printing speed in exported gcode will be slowed down, when the estimated layer time is shorter than this value, to "
                      "get better cooling for these layers");
@@ -2280,7 +2295,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 1000;
     def->mode = comSimple;
-    def->set_default_value(new ConfigOptionInts { 5 });
+    def->set_default_value(new ConfigOptionFloats { 5.0f });
 
     def = this->add("minimum_sparse_infill_area", coFloat);
     def->label = L("Minimum sparse infill threshold");

src/libslic3r/PrintConfig.hpp

@@ -679,6 +679,7 @@ PRINT_CONFIG_CLASS_DEFINE(
     ((ConfigOptionEnum<FuzzySkinType>,  fuzzy_skin))
     ((ConfigOptionFloat,                fuzzy_skin_thickness))
     ((ConfigOptionFloat,                fuzzy_skin_point_distance))
+    ((ConfigOptionFloat,                 filter_out_gap_fill))
     ((ConfigOptionFloat,                gap_infill_speed))
     ((ConfigOptionInt,                  sparse_infill_filament))
     ((ConfigOptionFloat,                sparse_infill_line_width))
@@ -759,7 +760,7 @@ PRINT_CONFIG_CLASS_DEFINE(
     ((ConfigOptionString,              machine_end_gcode))
     ((ConfigOptionStrings,             filament_end_gcode))
     ((ConfigOptionFloats,              filament_flow_ratio))
-    ((ConfigOptionBool,                enable_pressure_advance))
+    ((ConfigOptionBools,               enable_pressure_advance))
     ((ConfigOptionFloats,              pressure_advance))
     ((ConfigOptionFloats,              filament_diameter))
     ((ConfigOptionFloats,              filament_density))
@@ -840,10 +841,11 @@ 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))
-    ((ConfigOptionInts,               fan_cooling_layer_time))
+    ((ConfigOptionFloats,             fan_cooling_layer_time))
     ((ConfigOptionStrings,            filament_colour))
     ((ConfigOptionFloat,              outer_wall_acceleration))
     ((ConfigOptionFloat,              inner_wall_acceleration))
@@ -882,7 +884,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
     ((ConfigOptionFloat,              skirt_distance))
     ((ConfigOptionInt,                skirt_height))
     ((ConfigOptionInt,                skirt_loops))
-    ((ConfigOptionInts,               slow_down_layer_time))
+    ((ConfigOptionFloats,             slow_down_layer_time))
     ((ConfigOptionBool,               spiral_mode))
     ((ConfigOptionInt,                standby_temperature_delta))
     ((ConfigOptionInts,               nozzle_temperature))

src/libslic3r/PrintObject.cpp

@@ -673,7 +673,8 @@ bool PrintObject::invalidate_state_by_config_options(
             || opt_key == "inner_wall_line_width"
             || opt_key == "infill_wall_overlap") {
             steps.emplace_back(posPerimeters);
-        } else if (opt_key == "gap_infill_speed") {
+        } else if (opt_key == "gap_infill_speed"
+            || opt_key == "filter_out_gap_fill" ) {
             // Return true if gap-fill speed has changed from zero value to non-zero or from non-zero value to zero.
             auto is_gap_fill_changed_state_due_to_speed = [&opt_key, &old_config, &new_config]() -> bool {
                 if (opt_key == "gap_infill_speed") {
@@ -687,9 +688,9 @@ bool PrintObject::invalidate_state_by_config_options(
             };
 
             // Filtering of unprintable regions in multi-material segmentation depends on if gap-fill is enabled or not.
-            // So step posSlice is invalidated when gap-fill was enabled/disabled by option "gap_fill_enabled" or by
+            // So step posSlice is invalidated when gap-fill was enabled/disabled by option "filter_out_gap_fill" or by
             // changing "gap_infill_speed" to force recomputation of the multi-material segmentation.
-            if (this->is_mm_painted() && (opt_key == "gap_infill_speed" && is_gap_fill_changed_state_due_to_speed()))
+            if (this->is_mm_painted() && (opt_key == "filter_out_gap_fill" && (opt_key == "gap_infill_speed" && is_gap_fill_changed_state_due_to_speed())))
                 steps.emplace_back(posSlice);
             steps.emplace_back(posPerimeters);
         } else if (

src/slic3r/GUI/DownloadProgressDialog.cpp

@@ -31,8 +31,8 @@ namespace GUI {
 DownloadProgressDialog::DownloadProgressDialog(wxString title)
     : DPIDialog(static_cast<wxWindow *>(wxGetApp().mainframe), wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
 {
-    wxString download_failed_url = wxT("https://wiki.bambulab.com/e/en/software/bambu-studio/failed-to-get-network-plugin");
-    wxString install_failed_url = wxT("https://wiki.bambulab.com/e/en/software/bambu-studio/failed-to-get-network-plugin");
+    wxString download_failed_url = wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-get-network-plugin");
+    wxString install_failed_url = wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-get-network-plugin");
 
     wxString download_failed_msg = _L("Failed to download the plug-in. Please check your firewall settings and vpn software, check and retry.");
     wxString install_failed_msg = _L("Failed to install the plug-in. Please check whether it is blocked or deleted by anti-virus software.");

src/slic3r/GUI/GLCanvas3D.cpp

@@ -248,7 +248,8 @@ void GLCanvas3D::Labels::render(const std::vector<const ModelInstance*>& sorted_
                 return owner.model_instance_id == id;
                 });
             if (it != owners.end())
-                it->print_order = std::string((_(L("Sequence"))).ToUTF8()) + "#: " + std::to_string(i + 1);
+                //it->print_order = std::string((_(L("Sequence"))).ToUTF8()) + "#: " + std::to_string(i + 1);
+                it->print_order = std::string((_(L("Sequence"))).ToUTF8()) + "#: " + std::to_string(sorted_instances[i]->arrange_order);
         }
     }
 
@@ -6032,10 +6033,20 @@ void GLCanvas3D::_render_overlays()
     bool sequential_print = opt != nullptr && (opt->value == PrintSequence::ByObject);
     std::vector<const ModelInstance*> sorted_instances;
     if (sequential_print) {
-        for (ModelObject* model_object : m_model->objects)
+        const Print* print = fff_print();
+        if (print) {
+            for (const PrintObject *print_object : print->objects())
+            {
+                for (const PrintInstance &instance : print_object->instances())
+                {
+                    sorted_instances.emplace_back(instance.model_instance);
+                }
+            }
+        }
+        /*for (ModelObject* model_object : m_model->objects)
             for (ModelInstance* model_instance : model_object->instances) {
                 sorted_instances.emplace_back(model_instance);
-            }
+            }*/
     }
     m_labels.render(sorted_instances);
 

src/slic3r/GUI/GUI_Factories.cpp

@@ -1333,7 +1333,7 @@ void MenuFactory::append_menu_item_change_filament(wxMenu* menu)
             menu->Destroy(item_id);
     }
 
-    const int filaments_cnt = filaments_count();
+    int filaments_cnt = filaments_count();
     if (filaments_cnt <= 1)
         return;
 
@@ -1345,6 +1345,10 @@ void MenuFactory::append_menu_item_change_filament(wxMenu* menu)
     std::vector<wxBitmap*> icons = get_extruder_color_icons(true);
     if (icons.size() < filaments_cnt) {
         BOOST_LOG_TRIVIAL(warning) << boost::format("Warning: icons size %1%, filaments_cnt=%2%")%icons.size()%filaments_cnt;
+        if (icons.size() <= 1)
+            return;
+        else
+            filaments_cnt = icons.size();
     }
     wxMenu* extruder_selection_menu = new wxMenu();
     const wxString& name = sels.Count() == 1 ? names[0] : names[1];

src/slic3r/GUI/GUI_Preview.cpp

@@ -816,7 +816,6 @@ void AssembleView::reload_scene(bool refresh_immediately, bool force_full_scene_
             m_canvas->render(true);
         }
         m_canvas->reload_scene(refresh_immediately, force_full_scene_refresh);
-        m_canvas->reload_scene(refresh_immediately, force_full_scene_refresh);
     }
 }
 

src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp

@@ -611,6 +611,9 @@ void ModelObjectsInfo::on_update()
     if (!get_pool()->get_canvas()->get_model()->objects.empty()) {
         m_model_objects = get_pool()->get_canvas()->get_model()->objects;
     }
+    else {
+        m_model_objects.clear();
+    }
 }
 
 void ModelObjectsInfo::on_release()

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -345,7 +345,7 @@ void GLGizmosManager::update(const Linef3& mouse_ray, const Point& mouse_pos)
 void GLGizmosManager::update_assemble_view_data()
 {
     if (m_assemble_view_data) {
-        if (m_parent.get_canvas_type() != GLCanvas3D::CanvasAssembleView)
+        if (!wxGetApp().plater()->get_assmeble_canvas3D()->get_wxglcanvas()->IsShown())
             m_assemble_view_data->update(AssembleViewDataID(0));
         else
             m_assemble_view_data->update(AssembleViewDataID((int)AssembleViewDataID::ModelObjectsInfo | (int)AssembleViewDataID::ModelObjectsClipper));

src/slic3r/GUI/Jobs/ArrangeJob.cpp

@@ -503,6 +503,9 @@ void ArrangeJob::process()
     if (params.is_seq_print)
         params.min_obj_distance = std::max(params.min_obj_distance, scaled(params.cleareance_radius));
 
+    if (params.avoid_extrusion_cali_region && print.full_print_config().opt_bool("scan_first_layer"))
+        m_plater->get_partplate_list().preprocess_nonprefered_areas(m_unselected, MAX_NUM_PLATES);
+        
     double skirt_distance = print.has_skirt() ? print.config().skirt_distance.value : 0;
     double brim_max = 0;
     std::for_each(m_selected.begin(), m_selected.end(), [&](ArrangePolygon ap) {  brim_max = std::max(brim_max, ap.brim_width); });
@@ -514,21 +517,26 @@ void ArrangeJob::process()
     params.bed_shrink_y = settings.bed_shrink_y + params.brim_skirt_distance;
     // for sequential print, we need to inflate the bed because cleareance_radius is so large
     if (params.is_seq_print) {
-        params.bed_shrink_x -= params.cleareance_radius/2;
-        params.bed_shrink_y -= params.cleareance_radius/2;
+        float shift_dist = params.cleareance_radius / 2 - 5;
+        params.bed_shrink_x -= shift_dist;
+        params.bed_shrink_y -= shift_dist;
         // dont forget to move the excluded region
         for (auto& region : m_unselected) {
             if (region.is_virt_object)
-                region.poly.translate(-scaled(params.cleareance_radius/2), -scaled(params.cleareance_radius/2));
+                region.poly.translate(-scaled(shift_dist), -scaled(shift_dist));
         }
     }
 
     // do not inflate brim_width. Objects are allowed to have overlapped brim.
     std::for_each(m_selected.begin(), m_selected.end(), [&](auto& ap) {ap.inflation = params.min_obj_distance / 2; });
-    std::for_each(m_unselected.begin(), m_unselected.end(), [&](auto& ap) {ap.inflation = ap.is_virt_object ? scaled(params.brim_skirt_distance) : params.min_obj_distance / 2; });
+    // For occulusion regions, inflation should be larger to prevent genrating brim on them.
+    // However, extrusion cali regions are exceptional, since we can allow brim overlaps them.
+    std::for_each(m_unselected.begin(), m_unselected.end(), [&](auto &ap) {
+        ap.inflation = !ap.is_virt_object ?
+                           params.min_obj_distance / 2 :
+                           (ap.is_extrusion_cali_object ? scaled(params.cleareance_radius / 2) : scaled(params.brim_skirt_distance + params.cleareance_radius / 2));
+    });
 
-    if (params.avoid_extrusion_cali_region && print.full_print_config().opt_bool("scan_first_layer"))
-        m_plater->get_partplate_list().preprocess_nonprefered_areas(m_unselected, MAX_NUM_PLATES);
 
     m_plater->get_partplate_list().preprocess_exclude_areas(params.excluded_regions, 1);
 
@@ -567,6 +575,7 @@ void ArrangeJob::process()
             << ", bed_temp: " << selected.first_bed_temp << ", print_temp: " << selected.print_temp;
         BOOST_LOG_TRIVIAL(debug) << "items unselected before arrange: ";
         for (auto item : m_unselected)
+            if (!item.is_virt_object)
             BOOST_LOG_TRIVIAL(debug) << item.name << ", extruder: " << item.extrude_ids.back() << ", bed: " << item.bed_idx << ", trans: " << item.translation.transpose();
     }
 

src/slic3r/GUI/MainFrame.cpp

@@ -941,6 +941,7 @@ void MainFrame::init_tabpanel()
         //select_tab(MainFrame::tpMonitor);
         m_printer_view->load_url(url);
     });
+    m_printer_view->Hide();
 
     m_auxiliary = new AuxiliaryPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
     m_tabpanel->AddPage(m_auxiliary, _L("Project"), std::string("tab_auxiliary_avtice"), std::string("tab_auxiliary_avtice"));
@@ -979,6 +980,7 @@ void MainFrame::show_device(bool bBBLPrinter) {
       m_tabpanel->InsertPage(3, m_printer_view, _L("Device"),
                           std::string("tab_monitor_active"),
                           std::string("tab_monitor_active"));
+        m_printer_view->Show();
     }
   }
 

src/slic3r/GUI/PartPlate.cpp

@@ -3461,6 +3461,7 @@ bool PartPlateList::preprocess_nonprefered_areas(arrangement::ArrangePolygons& r
 			ret.translation = Vec2crd(0, 0);
 			ret.rotation = 0.0f;
 			ret.is_virt_object = true;
+            ret.is_extrusion_cali_object = true;
 			ret.bed_idx = j;
 			ret.height = 1;
 			ret.name = "NonpreferedRegion" + std::to_string(index);

src/slic3r/GUI/Plater.cpp

@@ -2020,7 +2020,8 @@ 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", "print_sequence",
-        "extruder_clearance_radius", "extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", "skirt_loops", "skirt_distance",
+        "extruder_clearance_radius", "extruder_clearance_max_radius",
+        "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",
@@ -7224,7 +7225,7 @@ void Plater::add_model(bool imperial_units/* = false*/)
     if (!load_files(paths, strategy, ask_multi).empty()) {
 
         if (get_project_name() == _L("Untitled") && paths.size() > 0) {
-            p->set_project_filename(wxString(paths[0].string()));
+            p->set_project_filename(wxString::FromUTF8(paths[0].string()));
         }
 
         wxGetApp().mainframe->update_title();
@@ -9319,6 +9320,7 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
 {
     bool update_scheduled = false;
     bool bed_shape_changed = false;
+    bool print_sequence_changed = false;
     t_config_option_keys diff_keys = p->config->diff(config);
     for (auto opt_key : diff_keys) {
         if (opt_key == "filament_colour") {
@@ -9369,6 +9371,7 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
         }
         else if (opt_key == "print_sequence") {
             update_scheduled = true;
+            print_sequence_changed = true;
         }
         else if (opt_key == "printer_model") {
             p->reset_gcode_toolpaths();
@@ -9393,6 +9396,9 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
         if (seq_print->value == PrintSequence::ByObject) {
             std::string info_text = L("Print By Object: \nSuggest to use auto-arrange to avoid collisions when printing.");
             notify_manager->bbl_show_seqprintinfo_notification(info_text);
+            //always show label when switch to sequence print
+            if (print_sequence_changed)
+                this->show_view3D_labels(true);
         }
         else
             notify_manager->bbl_close_seqprintinfo_notification();

src/slic3r/GUI/PresetHints.cpp

@@ -103,7 +103,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
     double bridge_flow                = print_config.opt_float("bridge_flow");
     double inner_wall_speed                  = print_config.opt_float("inner_wall_speed");
     double outer_wall_speed         = print_config.get_abs_value("outer_wall_speed", inner_wall_speed);
-    // double gap_infill_speed                   = print_config.opt_bool("gap_fill_enabled") ? print_config.opt_float("gap_infill_speed") : 0.;
+    // double gap_infill_speed                   = print_config.opt_bool("filter_out_gap_fill") ? print_config.opt_float("gap_infill_speed") : 0.;
     double sparse_infill_speed                     = print_config.opt_float("sparse_infill_speed");
     double small_perimeter_speed            = print_config.get_abs_value("small_perimeter_speed", inner_wall_speed);
     double internal_solid_infill_speed               = print_config.opt_float("internal_solid_infill_speed");

src/slic3r/GUI/PrinterWebView.cpp

@@ -23,17 +23,7 @@ PrinterWebView::PrinterWebView(wxWindow *parent)
 
     wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
 
-    // Create the button
-    bSizer_toolbar = new wxBoxSizer(wxHORIZONTAL);
-
-    //m_button_reload = new wxButton(this, wxID_ANY, wxT("Reload"), wxDefaultPosition, wxDefaultSize, 0);
-    //bSizer_toolbar->Add(m_button_reload, 0, wxALL, 5);
-
-    m_url = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
-    bSizer_toolbar->Add(m_url, 1, wxALL | wxEXPAND, 5);
-
-  
-    // Create the webview
+      // Create the webview
     m_browser = WebView::CreateWebView(this, "");
     if (m_browser == nullptr) {
         wxLogError("Could not init m_browser");
@@ -55,9 +45,6 @@ PrinterWebView::PrinterWebView(wxWindow *parent)
     //Zoom
     m_zoomFactor = 100;
 
-    // Connect the button events
-    //Bind(wxEVT_BUTTON, &PrinterWebView::OnReload, this, m_button_reload->GetId());
-    Bind(wxEVT_TEXT_ENTER, &PrinterWebView::OnUrl, this, m_url->GetId());
     //Connect the idle events
     Bind(wxEVT_CLOSE_WINDOW, &PrinterWebView::OnClose, this);
 
@@ -74,12 +61,9 @@ PrinterWebView::~PrinterWebView()
 
 void PrinterWebView::load_url(wxString& url)
 {
-    //this->Show();
-    //this->Raise();
-    m_url->SetLabelText(url);
+//    this->Show();
+//    this->Raise();
 
-    if (wxGetApp().get_mode() == comDevelop)
-        wxLogMessage(m_url->GetValue());
     m_browser->LoadURL(url);
     //m_browser->SetFocus();
     UpdateState();
@@ -90,28 +74,7 @@ void PrinterWebView::load_url(wxString& url)
  */
 void PrinterWebView::UpdateState() {
   // SetTitle(m_browser->GetCurrentTitle());
-  m_url->SetValue(m_browser->GetCurrentURL());
-}
 
-/**
-    * Callback invoked when user entered an URL and pressed enter
-    */
-void PrinterWebView::OnUrl(wxCommandEvent& WXUNUSED(evt))
-{
-    if (wxGetApp().get_mode() == comDevelop)
-        wxLogMessage(m_url->GetValue());
-    m_browser->LoadURL(m_url->GetValue());
-    m_browser->SetFocus();
-    UpdateState();
-}
-
-/**
-    * Callback invoked when user pressed the "reload" button
-    */
-void PrinterWebView::OnReload(wxCommandEvent& WXUNUSED(evt))
-{
-    m_browser->Reload();
-    UpdateState();
 }
 
 void PrinterWebView::OnClose(wxCloseEvent& evt)

src/slic3r/GUI/PrinterWebView.hpp

@@ -36,25 +36,14 @@ public:
     virtual ~PrinterWebView();
 
     void load_url(wxString& url);
-
     void UpdateState();
-    void OnUrl(wxCommandEvent& evt);
-    void OnReload(wxCommandEvent& evt);
-        void OnClose(wxCloseEvent& evt);
+    void OnClose(wxCloseEvent& evt);
 
 private:
 
     wxWebView* m_browser;
-    wxBoxSizer *bSizer_toolbar;
-    wxButton *  m_button_reload;
-    wxTextCtrl *m_url;
-
     long m_zoomFactor;
 
-    // Last executed JavaScript snippet, for convenience.
-    // wxString m_javascript;
-    // wxString m_response_js;
-
     // DECLARE_EVENT_TABLE()
 };
 

src/slic3r/GUI/ReleaseNote.cpp

@@ -89,6 +89,7 @@ void ReleaseNoteDialog::update_release_note(wxString release_note, std::string v
     sizer_text_release_note->Add(m_staticText_release_note, 0, wxALL, 5);
     m_vebview_release_note->SetSizer(sizer_text_release_note);
     m_vebview_release_note->Layout();
+    m_vebview_release_note->Fit();
 }
 
 void UpdateVersionDialog::alter_choice(wxCommandEvent& event)
@@ -333,6 +334,7 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
         sizer_text_release_note->Add(m_staticText_release_note, 0, wxALL, 5);
         m_scrollwindows_release_note->SetSizer(sizer_text_release_note);
         m_scrollwindows_release_note->Layout();
+        m_scrollwindows_release_note->Fit();
     }  
 }
 

src/slic3r/GUI/SelectMachine.cpp

@@ -643,7 +643,7 @@ void SelectMachinePopup::update_other_devices()
     m_placeholder_panel = new wxWindow(m_scrolledWindow, wxID_ANY, wxDefaultPosition, wxSize(-1,FromDIP(26)));
     wxBoxSizer* placeholder_sizer = new wxBoxSizer(wxVERTICAL);
 
-    auto m_hyperlink = new wxHyperlinkCtrl(m_placeholder_panel, wxID_ANY, _L("Can't find my devices?"), wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-connect-printer"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+    m_hyperlink = new wxHyperlinkCtrl(m_placeholder_panel, wxID_ANY, _L("Can't find my devices?"), wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-connect-printer"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
     placeholder_sizer->Add(m_hyperlink, 0, wxALIGN_CENTER | wxALL, 5);
 
 
@@ -860,6 +860,12 @@ void SelectMachinePopup::OnLeftUp(wxMouseEvent &event)
                 wxPostEvent(p->mPanel, event);
             }
         }
+
+        //hyper link
+        auto h_rect = m_hyperlink->ClientToScreen(wxPoint(0, 0));
+        if (mouse_pos.x > h_rect.x && mouse_pos.y > h_rect.y && mouse_pos.x < (h_rect.x + m_hyperlink->GetSize().x) && mouse_pos.y < (h_rect.y + m_hyperlink->GetSize().y)) {
+          wxLaunchDefaultBrowser(wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-connect-printer"));
+        } 
     }
 }
 

src/slic3r/GUI/SelectMachine.hpp

@@ -198,6 +198,7 @@ private:
     int                               m_my_devices_count{0};
     int                               m_other_devices_count{0};
     wxWindow*                         m_placeholder_panel{nullptr};
+    wxHyperlinkCtrl*                  m_hyperlink{nullptr};
     wxBoxSizer *                      m_sizer_body{nullptr};
     wxBoxSizer *                      m_sizer_my_devices{nullptr};
     wxBoxSizer *                      m_sizer_other_devices{nullptr};

src/slic3r/GUI/Tab.cpp

@@ -1806,6 +1806,7 @@ void TabPrint::build()
         optgroup->append_single_option_line("sparse_infill_pattern", "fill-patterns#infill types and their properties of sparse");
         optgroup->append_single_option_line("top_surface_pattern", "fill-patterns#Infill of the top surface and bottom surface");
         optgroup->append_single_option_line("bottom_surface_pattern", "fill-patterns#Infill of the top surface and bottom surface");
+        optgroup->append_single_option_line("filter_out_gap_fill");
 
         optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");
         optgroup->append_single_option_line("infill_wall_overlap");
@@ -2674,7 +2675,7 @@ void TabFilament::toggle_options()
     }
     if (m_active_page->title() == "Filament")
     {
-        bool pa = m_config->opt_bool("enable_pressure_advance");
+        bool pa = m_config->opt_bool("enable_pressure_advance", 0);
         toggle_option("pressure_advance", pa);
 
         toggle_line("cool_plate_temp_initial_layer", is_BBL_printer);

version.inc

@@ -10,5 +10,5 @@ endif()
 if(NOT DEFINED BBL_INTERNAL_TESTING)
 set(BBL_INTERNAL_TESTING "1")
 endif()
-set(SLIC3R_VERSION "01.03.00.12")
+set(SLIC3R_VERSION "01.03.00.22")
 set(SoftFever_VERSION "1.3.2")