Clean and simplify code

CURA-12250

Author: wawanbreton

include/Scene.h

@@ -71,6 +71,8 @@ class Scene
      */
     void processMeshGroup(MeshGroup& mesh_group);
 
+    const ExtruderTrain& getExtruder(const ExtruderNumber extruder_nr) const;
+
 private:
     /*
      * \brief You are not allowed to copy the scene.

include/feature_generation/SkirtBrimAppender.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <settings/EnumSettings.h>
+#include <utils/ExtrudersSet.h>
 
 #include "ExtruderNumber.h"
 #include "operation_transformation/PrintOperationTransformer.h"
@@ -27,41 +28,6 @@ class SkirtBrimAppender : public PrintOperationTransformer<PrintPlan>
     void process(PrintPlan* print_plan) override;
 
 private:
-    /*!
-     * A helper class to store an offset yet to be performed on either an outline polygon, or based on an earlier generated brim line.
-     */
-    struct Offset
-    {
-        Offset(
-            const std::variant<const Shape*, int>& reference_outline_or_index,
-            const bool outside,
-            const bool inside,
-            const coord_t offset_value,
-            const coord_t total_offset,
-            const size_t inset_idx,
-            const size_t extruder_nr,
-            const bool is_last)
-            : reference_outline_or_index_(reference_outline_or_index)
-            , outside_(outside)
-            , inside_(inside)
-            , offset_value_(offset_value)
-            , total_offset_(total_offset)
-            , inset_idx_(inset_idx)
-            , extruder_nr_(extruder_nr)
-            , is_last_(is_last)
-        {
-        }
-
-        std::variant<const Shape*, int> reference_outline_or_index_;
-        bool outside_; //!< Wether to offset outward from the reference polygons
-        bool inside_; //!< Wether to offset inward from the reference polygons
-        coord_t offset_value_; //!< Distance by which to offset from the reference
-        coord_t total_offset_; //!< Total distance from the model
-        int inset_idx_; //!< The outset index of this brimline
-        ExtruderNumber extruder_nr_; //!< The extruder by which to print this brim line
-        bool is_last_; //!< Whether this is the last planned offset for this extruder.
-    };
-
     /*!
      * Container to store the pre-extracted settings of an extruder
      */
@@ -74,63 +40,49 @@ class SkirtBrimAppender : public PrintOperationTransformer<PrintPlan>
         int line_count_; //!< The (minimal) number of brim lines to generate
         coord_t gap_; //!< The gap between the part and the first brim/skirt line
         coord_t brim_inside_margin_;
+        size_t skirt_height_;
     };
 
     static constexpr coord_t min_brim_line_length_ = 3000u; //!< open polyline brim lines smaller than this will be removed
-    std::map<ExtruderNumber, ExtruderConfig> extruders_configs_;
     const SliceDataStorage& storage_;
 
 private:
-    static bool sortOffsets(const Offset& a, const Offset& b)
-    {
-        // Use extruder_nr in case both extruders have the same offset settings.
-        return a.total_offset_ != b.total_offset_ ? a.total_offset_ < b.total_offset_ : a.extruder_nr_ < b.extruder_nr_;
-    };
+    static std::tuple<std::vector<ConstExtruderPlanPtr>, ExtrudersSet> generateUsedExtruders(const PrintPlan* print_plan);
+
+    static size_t calculateMaxHeight(const std::map<ExtruderNumber, ExtruderConfig>& extruders_configs, const EPlatformAdhesion adhesion_type);
+
+    static std::map<ExtruderNumber, ExtruderConfig> generateExtrudersConfigs(const ExtrudersSet& used_extruders, const EPlatformAdhesion adhesion_type);
 
-    static std::map<ExtruderNumber, Shape> generateStartingOutlines(const PrintPlan* print_plan,
+    static std::map<ExtruderNumber, Shape> generateStartingOutlines(
+        const PrintPlan* print_plan,
         const std::optional<ExtruderNumber> skirt_brim_extruder_nr,
         const size_t height,
         const EPlatformAdhesion adhesion_type,
         const ExtrudersSet& used_extruders);
 
-    std::vector<Offset> generateBrimOffsetPlan(const std::optional<ExtruderNumber> skirt_brim_extruder_nr,
-        const EPlatformAdhesion adhesion_type,
+    std::map<ExtruderNumber, Shape> generateAllowedAreas(
         const std::map<ExtruderNumber, Shape>& starting_outlines,
-        const ExtrudersSet &used_extruders) const;
-
-    std::map<ExtruderNumber, Shape> generateAllowedAreas(const std::map<ExtruderNumber, Shape>& starting_outlines,
         const EPlatformAdhesion adhesion_type,
-        const ExtrudersSet &used_extruders,
+        const ExtrudersSet& used_extruders,
         const std::optional<ExtruderNumber> skirt_brim_extruder_nr,
-        const SliceDataStorage& storage) const;
+        const std::map<ExtruderNumber, ExtruderConfig>& extruders_configs) const;
 
-    void generateSkirtBrim(const SliceDataStorage& storage,
+    static void generateSkirtBrim(
         const EPlatformAdhesion adhesion_type,
-        const std::map<ExtruderNumber, Shape>& starting_outlines,
-        std::vector<Offset>& offset_plan,
-        std::map<ExtruderNumber, Shape>& allowed_areas_per_extruder,
-        PrintPlan* print_plan) const;
-
-    void generateSkirtBrimV2(const SliceDataStorage& storage,
-        const EPlatformAdhesion adhesion_type,
-        const ExtrudersSet &used_extruders,
+        const ExtrudersSet& used_extruders,
         const std::vector<ConstExtruderPlanPtr> first_extruder_plans,
-        const std::map<ExtruderNumber,
-        Shape>& starting_outlines,
-        std::map<ExtruderNumber, Shape>& allowed_areas_per_extruder,
-        PrintPlan* print_plan) const;
-
-    FeatureExtrusionPtr generateOffset(const Offset& offset,
         const std::map<ExtruderNumber, Shape>& starting_outlines,
-        Shape& covered_area,
         std::map<ExtruderNumber, Shape>& allowed_areas_per_extruder,
-        const LayerPlanPtr &layer_plan) const;
+        const std::map<ExtruderNumber, ExtruderConfig>& extruders_configs,
+        PrintPlan* print_plan);
 
-    FeatureExtrusionPtr generateOffsetV2(const ExtruderNumber extruder_nr,
+    static FeatureExtrusionPtr generateOffset(
+        const ExtruderNumber extruder_nr,
         const coord_t total_offset,
         Shape& covered_area,
         std::map<ExtruderNumber, Shape>& allowed_areas_per_extruder,
-        const LayerPlanPtr &layer_plan) const;
+        const std::map<ExtruderNumber, ExtruderConfig>& extruders_configs,
+        const LayerPlanPtr& layer_plan);
 };
 
 } // namespace cura

include/settings/Settings.h

@@ -18,6 +18,7 @@
 #include <sstream>
 #include <unordered_map>
 #include <vector>
+#include <cstdint>
 
 namespace cura
 {

include/utils/ExtrudersSet.h

@@ -3,9 +3,11 @@
 
 #pragma once
 
+#include <bit>
+#include <optional>
+
 #include "settings/Settings.h"
 #include "ExtruderNumber.h"
-#include <bit>
 
 namespace cura
 {
@@ -57,17 +59,17 @@ class ExtrudersSet
 public:
     bool contains(const ExtruderNumber extruder_nr) const
     {
-        return extruders_mask_ & (1 << extruder_nr);
+        return extruders_mask_ & (static_cast<EXTRUDERS_BITMASK_TYPE>(1) << extruder_nr);
     }
 
     void set(const ExtruderNumber extruder_nr)
     {
-        extruders_mask_ |= (1 << extruder_nr);
+        extruders_mask_ |= (static_cast<EXTRUDERS_BITMASK_TYPE>(1) << extruder_nr);
     }
 
     void unset(const ExtruderNumber extruder_nr)
     {
-        extruders_mask_ &= ~(1 << extruder_nr);
+        extruders_mask_ &= ~(static_cast<EXTRUDERS_BITMASK_TYPE>(1) << extruder_nr);
     }
 
     bool empty() const

src/Scene.cpp

@@ -3,6 +3,7 @@
 
 #include "Scene.h"
 
+#include <range/v3/algorithm/find_if.hpp>
 #include <spdlog/spdlog.h>
 
 #include "Application.h"
@@ -100,4 +101,9 @@ void Scene::processMeshGroup(MeshGroup& mesh_group)
     spdlog::info("Total time elapsed {:03.3f}s\n", time_keeper_total.restart());
 }
 
+const ExtruderTrain& Scene::getExtruder(const ExtruderNumber extruder_nr) const
+{
+    return *ranges::find_if(extruders, [extruder_nr](const ExtruderTrain &extruder){ return extruder.extruder_nr_ == extruder_nr; });
+}
+
 } // namespace cura