Include geometry/LinesSet.h in multiple source files

The necessary header geometry/LinesSet.h has been included into multiple files across the project. This marks an important step for functionality expansion as the new header file has updated geometrical methods that are crucial for the application to function optimally. Copyright years in certain files were also updated. Contribute to CURA-9830
Ultimaker · May 6, 2024 · f8bc709 · f8bc709
1 parent fdeb565
commit f8bc709
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 16 deletions.
diff --git a/benchmark/infill_benchmark.h b/benchmark/infill_benchmark.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 UltiMaker
+// Copyright (c) 2024 UltiMaker
 // CuraEngine is released under the terms of the AGPLv3 or higher
 
 #ifndef CURAENGINE_INFILL_BENCHMARK_H
@@ -8,6 +8,7 @@
 
 #include "geometry/OpenLinesSet.h"
 #include "geometry/OpenPolyline.h"
+#include "geometry/LinesSet.h"
 #include "infill.h"
 
 namespace cura

diff --git a/include/LayerPlan.h b/include/LayerPlan.h
@@ -10,6 +10,8 @@
 #include "PathOrderOptimizer.h"
 #include "SpaceFillType.h"
 #include "gcodeExport.h"
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/Polygon.h"
 #include "pathPlanning/GCodePath.h"
 #include "pathPlanning/NozzleTempInsert.h"

diff --git a/include/TreeSupportTipGenerator.h b/include/TreeSupportTipGenerator.h
@@ -11,6 +11,8 @@
 #include "TreeSupportEnums.h"
 #include "TreeSupportSettings.h"
 #include "boost/functional/hash.hpp" // For combining hashes
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/Polygon.h"
 #include "polyclipping/clipper.hpp"
 #include "settings/EnumSettings.h"

diff --git a/include/TreeSupportUtils.h b/include/TreeSupportUtils.h
@@ -12,6 +12,8 @@
 #include "TreeSupportEnums.h"
 #include "TreeSupportSettings.h"
 #include "boost/functional/hash.hpp" // For combining hashes
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/OpenPolyline.h"
 #include "geometry/Polygon.h"
 #include "infill.h"

diff --git a/include/infill.h b/include/infill.h
@@ -8,6 +8,8 @@
 
 #include <range/v3/range/concepts.hpp>
 
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/Point2LL.h"
 #include "infill/LightningGenerator.h"
 #include "infill/ZigzagConnectorProcessor.h"

diff --git a/include/infill/GyroidInfill.h b/include/infill/GyroidInfill.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2020 Ultimaker B.V.
+// Copyright (c) 2024 UltiMaker
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
-#include "../utils/Coord_t.h"
+#include "geometry/LinesSet.h"
 #include "geometry/OpenLinesSet.h"
+#include "utils/Coord_t.h"
 
 namespace cura
 {
-
 class Shape;
 
 class GyroidInfill
@@ -38,5 +38,4 @@ class GyroidInfill
 
 private:
 };
-
 } // namespace cura
diff --git a/include/infill/LightningLayer.h b/include/infill/LightningLayer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 UltiMaker
+// Copyright (c) 2024 UltiMaker
 // CuraEngine is released under the terms of the AGPLv3 or higher
 
 #ifndef LIGHTNING_LAYER_H
@@ -9,9 +9,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../utils/SquareGrid.h"
-#include "../utils/polygonUtils.h"
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "infill/LightningTreeNode.h"
+#include "utils/SquareGrid.h"
+#include "utils/polygonUtils.h"
 
 namespace cura
 {
@@ -74,7 +76,6 @@ class LightningLayer
 
     void fillLocator(SparseLightningTreeNodeGrid& tree_node_locator);
 };
-
 } // namespace cura
 
 #endif // LIGHTNING_LAYER_H
diff --git a/include/infill/LightningTreeNode.h b/include/infill/LightningTreeNode.h
@@ -9,9 +9,11 @@
 #include <optional>
 #include <vector>
 
-#include "../utils/polygonUtils.h"
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/Polygon.h"
 #include "geometry/Shape.h"
+#include "utils/polygonUtils.h"
 
 namespace cura
 {

diff --git a/include/infill/NoZigZagConnectorProcessor.h b/include/infill/NoZigZagConnectorProcessor.h
@@ -5,6 +5,7 @@
 #define INFILL_NO_ZIGZAG_CONNECTOR_PROCESSOR_H
 
 #include "ZigzagConnectorProcessor.h"
+#include "geometry/OpenLinesSet.h"
 
 namespace cura
 {
@@ -22,12 +23,12 @@ class NoZigZagConnectorProcessor : public ZigzagConnectorProcessor
 public:
     NoZigZagConnectorProcessor(const PointMatrix& rotation_matrix, OpenLinesSet& result)
         : ZigzagConnectorProcessor(
-            rotation_matrix,
-            result,
-            false,
-            false, // settings for zig-zag end pieces, no use here
-            false,
-            0) // settings for skipping some zags, no use here
+              rotation_matrix,
+              result,
+              false,
+              false, // settings for zig-zag end pieces, no use here
+              false,
+              0) // settings for skipping some zags, no use here
     {
     }
 

diff --git a/include/plugins/converters.h b/include/plugins/converters.h
@@ -27,6 +27,8 @@
 #include "cura/plugins/slots/postprocess/v0/modify.pb.h"
 #include "cura/plugins/slots/simplify/v0/modify.grpc.pb.h"
 #include "cura/plugins/slots/simplify/v0/modify.pb.h"
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/Polygon.h"
 #include "pathPlanning/GCodePath.h"
 #include "pathPlanning/SpeedDerivatives.h"

diff --git a/include/plugins/slots.h b/include/plugins/slots.h
@@ -17,6 +17,8 @@
 #include "cura/plugins/slots/postprocess/v0/modify.grpc.pb.h"
 #include "cura/plugins/slots/simplify/v0/modify.grpc.pb.h"
 #include "cura/plugins/v0/slot_id.pb.h"
+#include "geometry/LinesSet.h"
+#include "geometry/OpenLinesSet.h"
 #include "geometry/Point2LL.h"
 #include "geometry/Polygon.h"
 #include "infill.h"

diff --git a/include/slicer.h b/include/slicer.h
@@ -8,6 +8,7 @@
 #include <queue>
 #include <unordered_map>
 
+#include "geometry/LinesSet.h"
 #include "geometry/OpenLinesSet.h"
 #include "geometry/OpenPolyline.h"
 #include "geometry/Shape.h"

diff --git a/include/utils/MixedPolylineStitcher.h b/include/utils/MixedPolylineStitcher.h
@@ -6,6 +6,7 @@
 
 #include "PolylineStitcher.h"
 #include "geometry/ClosedLinesSet.h"
+#include "geometry/LinesSet.h"
 #include "geometry/OpenLinesSet.h"
 
 namespace cura

diff --git a/include/utils/OpenPolylineStitcher.h b/include/utils/OpenPolylineStitcher.h
@@ -5,6 +5,7 @@
 #define UTILS_OPEN_POLYLINE_STITCHER_H
 
 #include "PolylineStitcher.h"
+#include "geometry/LinesSet.h"
 #include "geometry/OpenLinesSet.h"
 #include "geometry/Shape.h"
 

diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp
@@ -26,6 +26,7 @@
 #include "bridge.h"
 #include "communication/Communication.h" //To send layer view data.
 #include "geometry/OpenPolyline.h"
+#include "geometry/LinesSet.h"
 #include "geometry/PointMatrix.h"
 #include "infill.h"
 #include "progress/Progress.h"