Merge branch 'main' into NP-327_emscripten_communication

Ultimaker · Aug 21, 2024 · 463df70 · 463df70
2 parents 2a6b939 + 1b78d4f
commit 463df70
Show file tree

Hide file tree

Showing 15 changed files with 2,538 additions and 3 deletions.
diff --git a/include/ExtruderPlan.h b/include/ExtruderPlan.h
@@ -42,6 +42,7 @@ class ExtruderPlan
     FRIEND_TEST(ExtruderPlanPathsParameterizedTest, BackPressureCompensationFull);
     FRIEND_TEST(ExtruderPlanPathsParameterizedTest, BackPressureCompensationHalf);
     FRIEND_TEST(ExtruderPlanTest, BackPressureCompensationEmptyPlan);
+    friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
 #endif
 public:
     size_t extruder_nr_{ 0 }; //!< The extruder used for this paths in the current plan.

diff --git a/include/FffGcodeWriter.h b/include/FffGcodeWriter.h
@@ -38,6 +38,8 @@ struct MeshPathConfigs;
 class FffGcodeWriter : public NoCopy
 {
     friend class FffProcessor; // Because FffProcessor exposes finalize (TODO)
+    friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
+
 private:
     coord_t max_object_height; //!< The maximal height of all previously sliced meshgroups, used to avoid collision when moving to the next meshgroup to print.
 

diff --git a/include/LayerPlan.h b/include/LayerPlan.h
@@ -53,6 +53,7 @@ class LayerPlan : public NoCopy
     friend class LayerPlanBuffer;
 #ifdef BUILD_TESTS
     friend class AddTravelTest;
+    friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
 #endif
 
 public:
@@ -778,6 +779,12 @@ class LayerPlan : public NoCopy
      */
     void applyBackPressureCompensation();
 
+    /*!
+     * If enabled, applies the gradual flow acceleration splitting, that improves printing quality when printing at very high speed,
+     * especially with a bowden extruder.
+     */
+    void applyGradualFlow();
+
 private:
     /*!
      * \brief Compute the preferred or minimum combing boundary

diff --git a/include/geometry/LinesSet.h b/include/geometry/LinesSet.h
@@ -158,7 +158,7 @@ class LinesSet
     template<class OtherLineType>
     void push_back(LinesSet<OtherLineType>&& lines_set);
 
-    /*! \brief Pushes an entier set at the end */
+    /*! \brief Pushes an entire set at the end */
     void push_back(const LinesSet& other)
     {
         lines_.insert(lines_.end(), other.lines_.begin(), other.lines_.end());

diff --git a/include/geometry/PointsSet.h b/include/geometry/PointsSet.h
@@ -78,6 +78,12 @@ class PointsSet
         points_.push_back(point);
     }
 
+    /*! \brief Pushes an entire set at the end */
+    void push_back(const PointsSet& other)
+    {
+        points_.insert(points_.end(), other.points_.begin(), other.points_.end());
+    }
+
     void emplace_back(auto&&... args)
     {
         points_.emplace_back(std::forward<decltype(args)>(args)...);