[CURA-12446] Added settings for a different number of walls in top-/bottom-most skin.

include/FffGcodeWriter.h

@@ -575,6 +575,7 @@ class FffGcodeWriter : public NoCopy
      * \param skin_overlap The amount by which to expand the \p area
      * \param skin density Sets the density of the the skin lines by adjusting the distance between them (normal skin is 1.0)
      * \param monotonic Whether to order lines monotonically (``true``) or to
+     * \param is_roofing_flooring Indicates whether we are currently processing a top/bottom layer, or a skin layer
      * minimise travel moves (``false``).
      * \param[out] added_something Whether this function added anything to the layer plan
      * \param fan_speed fan speed override for this skin area
@@ -591,6 +592,7 @@ class FffGcodeWriter : public NoCopy
         const coord_t skin_overlap,
         const Ratio skin_density,
         const bool monotonic,
+        const bool is_roofing_flooring,
         bool& added_something,
         double fan_speed = GCodePathConfig::FAN_SPEED_DEFAULT) const;
 

include/layerPart.h

@@ -1,5 +1,5 @@
-//Copyright (c) 2018 Ultimaker B.V.
-//CuraEngine is released under the terms of the AGPLv3 or higher.
+// Copyright (c) 2025 UltiMaker
+// CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #ifndef LAYERPART_H
 #define LAYERPART_H
@@ -19,28 +19,16 @@ It's also the first step that stores the result in the "data storage" so all oth
 namespace cura
 {
 
-class Settings;
-class SliceLayer;
 class Slicer;
-class SlicerLayer;
 class SliceMeshStorage;
 
-/*!
- * \brief Split a layer into parts.
- * \param settings The settings to get the settings from (whether to union or
- * not).
- * \param storageLayer Where to store the parts.
- * \param layer The layer to split.
- */
-void createLayerWithParts(const Settings& settings, SliceLayer& storageLayer, SlicerLayer* layer);
-
 /*!
  * \brief Split all layers into parts.
  * \param mesh The mesh of which to split the layers into parts.
  * \param slicer The slicer to get the layers from.
  */
 void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer);
 
-}//namespace cura
+} // namespace cura
 
-#endif//LAYERPART_H
+#endif // LAYERPART_H

include/sliceDataStorage.h

@@ -57,6 +57,14 @@ class SkinPart
 class SliceLayerPart
 {
 public:
+    enum class WallExposedType
+    {
+        LAYER_0,
+        ROOFING,
+        SIDE_ONLY,
+    };
+    WallExposedType wall_exposed = WallExposedType::SIDE_ONLY;
+
     AABB boundaryBox; //!< The boundaryBox is an axis-aligned boundary box which is used to quickly check for possible
                       //!< collision between different parts on different layers. It's an optimization used during
                       //!< skin calculations.
@@ -461,6 +469,11 @@ class SliceDataStorage : public NoCopy
      */
     Shape getMachineBorder(int extruder_nr = -1) const;
 
+    /*!
+     * @return The raw outer build plate shape without any disallowed area
+     */
+    Shape getRawMachineBorder() const;
+
     void initializePrimeTower();
 
 private:

src/FffGcodeWriter.cpp

@@ -3473,7 +3473,21 @@ void FffGcodeWriter::processRoofingFlooring(
     const Ratio skin_density = 1.0;
     const coord_t skin_overlap = 0; // skinfill already expanded over the roofing areas; don't overlap with perimeters
     const bool monotonic = mesh.settings.get<bool>(settings_names.monotonic);
-    processSkinPrintFeature(storage, gcode_layer, mesh, extruder_nr, fill, config, pattern, roofing_angle, skin_overlap, skin_density, monotonic, added_something);
+    constexpr bool is_roofing_flooring = true;
+    processSkinPrintFeature(
+        storage,
+        gcode_layer,
+        mesh,
+        extruder_nr,
+        fill,
+        config,
+        pattern,
+        roofing_angle,
+        skin_overlap,
+        skin_density,
+        monotonic,
+        is_roofing_flooring,
+        added_something);
 }
 
 void FffGcodeWriter::processTopBottom(
@@ -3641,6 +3655,7 @@ void FffGcodeWriter::processTopBottom(
         }
     }
     const bool monotonic = mesh.settings.get<bool>("skin_monotonic");
+    constexpr bool is_roofing_flooring = false;
     processSkinPrintFeature(
         storage,
         gcode_layer,
@@ -3653,6 +3668,7 @@ void FffGcodeWriter::processTopBottom(
         skin_overlap,
         skin_density,
         monotonic,
+        is_roofing_flooring,
         added_something,
         fan_speed);
 }
@@ -3669,6 +3685,7 @@ void FffGcodeWriter::processSkinPrintFeature(
     const coord_t skin_overlap,
     const Ratio skin_density,
     const bool monotonic,
+    const bool is_roofing_flooring,
     bool& added_something,
     double fan_speed) const
 {
@@ -3679,7 +3696,6 @@ void FffGcodeWriter::processSkinPrintFeature(
     constexpr int infill_multiplier = 1;
     constexpr int extra_infill_shift = 0;
     const size_t wall_line_count = mesh.settings.get<size_t>("skin_outline_count");
-    const coord_t small_area_width = mesh.settings.get<coord_t>("small_skin_width");
     const bool zig_zaggify_infill = pattern == EFillMethod::ZIG_ZAG;
     const bool connect_polygons = mesh.settings.get<bool>("connect_skin_polygons");
     coord_t max_resolution = mesh.settings.get<coord_t>("meshfix_maximum_resolution");
@@ -3693,6 +3709,7 @@ void FffGcodeWriter::processSkinPrintFeature(
     constexpr int zag_skip_count = 0;
     constexpr coord_t pocket_size = 0;
     const bool small_areas_on_surface = mesh.settings.get<bool>("small_skin_on_surface");
+    const coord_t small_area_width = (small_areas_on_surface || ! is_roofing_flooring) ? mesh.settings.get<coord_t>("small_skin_width") : 0;
     const auto& current_layer = mesh.layers[gcode_layer.getLayerNr()];
     const auto& exposed_to_air = current_layer.top_surface.areas.unionPolygons(current_layer.bottom_surface);
 

src/WallsComputation.cpp

@@ -37,7 +37,10 @@ WallsComputation::WallsComputation(const Settings& settings, const LayerIndex la
  */
 void WallsComputation::generateWalls(SliceLayerPart* part, SectionType section_type)
 {
-    size_t wall_count = settings_.get<size_t>("wall_line_count");
+    const std::map<SliceLayerPart::WallExposedType, std::string> wall_count_setting_names({ { SliceLayerPart::WallExposedType::LAYER_0, "wall_line_count_layer_0" },
+                                                                                            { SliceLayerPart::WallExposedType::ROOFING, "wall_line_count_roofing" },
+                                                                                            { SliceLayerPart::WallExposedType::SIDE_ONLY, "wall_line_count" } });
+    size_t wall_count = settings_.get<size_t>(wall_count_setting_names.at(part->wall_exposed));
     if (wall_count == 0) // Early out if no walls are to be generated
     {
         part->print_outline = part->outline;