Building base architecture for separate generators

CURA-12250

Author: wawanbreton

include/GCodePathConfig.h

@@ -23,7 +23,8 @@ struct GCodePathConfig
     coord_t z_offset{}; //<! vertical offset from 'full' layer height, to be applied to the whole path
     PrintFeatureType type{}; //!< name of the feature type
     coord_t line_width{}; //!< width of the line extruded
-    // coord_t layer_thickness{}; //!< current layer height in micron
+#warning remove this, thickness should be on LayerPlan only
+    coord_t layer_thickness{}; //!< current layer height in micron
     Ratio flow{}; //!< extrusion flow modifier.
     SpeedDerivatives speed_derivatives{}; //!< The speed settings (and acceleration and jerk) of the extruded line. May be changed when smoothSpeed is called.
     bool is_bridge_path{ false }; //!< whether current config is used when bridging

include/feature_generation/FeatureGenerator.h

@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "print_operation/ExtruderPlanPtr.h"
-#include "print_operation/FeatureExtrusionPtr.h"
 
 namespace cura
 {

include/operation_transformation/LayerPlanTravelMovesInserter.h

@@ -13,6 +13,7 @@ namespace cura
 {
 
 class TravelMoveGenerator;
+struct SpeedDerivatives;
 
 class LayerPlanTravelMovesInserter : public PrintOperationTransformer<LayerPlan>
 {

include/print_operation/ExtruderPlan.h

@@ -9,18 +9,23 @@ namespace cura
 {
 
 class FeatureExtrusion;
+struct SpeedDerivatives;
 
 class ExtruderPlan : public PrintOperationSequence
 {
 public:
-    explicit ExtruderPlan(const size_t extruder_nr) noexcept;
+    explicit ExtruderPlan(const size_t extruder_nr, const SpeedDerivatives& travel_speed) noexcept;
 
     size_t getExtruderNr() const noexcept;
 
+    const SpeedDerivatives& getTravelSpeed() const noexcept;
+
     void appendFeatureExtrusion(const std::shared_ptr<FeatureExtrusion>& feature_extrusion, const bool check_non_empty = true);
 
 private:
     const size_t extruder_nr_;
+#warning use a shared_ptr
+    const SpeedDerivatives& travel_speed_;
 };
 
 } // namespace cura

include/print_operation/FeatureExtrusion.h

@@ -27,8 +27,6 @@ class FeatureExtrusion : public PrintOperationSequence
 
     coord_t getLineWidth() const;
 
-    coord_t getLayerThickness() const;
-
 private:
     const Ratio& getFlow() const;
 

include/print_operation/LayerPlan.h

@@ -10,10 +10,12 @@
 namespace cura
 {
 
+struct PathConfigStorage;
+
 class LayerPlan : public PrintOperationSequence
 {
 public:
-    LayerPlan(const LayerIndex& layer_index, const coord_t z, const coord_t thickness);
+    LayerPlan(const LayerIndex& layer_index, const coord_t z, const coord_t thickness, const std::shared_ptr<PathConfigStorage>& configs);
 
     virtual ~LayerPlan() = default;
 
@@ -23,16 +25,19 @@ class LayerPlan : public PrintOperationSequence
 
     coord_t getZ() const;
 
+    coord_t getThickness() const;
+
     void write(PlanExporter& exporter) const override;
 
     std::optional<Point3LL> findExtruderStartPosition() const;
 
-    Point3LL getAbsolutePosition(const ContinuousExtruderMoveSequence& extruder_move_set, const Point3LL& relative_position) const;
+    Point3LL getAbsolutePosition(const ContinuousExtruderMoveSequence& move_sequence, const Point3LL& relative_position) const;
 
 private:
     const LayerIndex layer_index_;
     const coord_t z_;
     const coord_t thickness_;
+    const std::shared_ptr<PathConfigStorage> configs_;
 };
 
 } // namespace cura