From 663191955cbdbf80729a7ea7184da5f883224008 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Thu, 2 Nov 2023 20:25:22 +0000 Subject: [PATCH] Applied clang-format. --- include/PathOrderOptimizer.h | 20 ++++++++++---------- include/infill.h | 8 ++++---- src/SkeletalTrapezoidationGraph.cpp | 6 +++--- src/gcodeExport.cpp | 14 +++++++------- src/infill.cpp | 14 +++++++------- src/settings/MeshPathConfigs.cpp | 4 ++-- src/skin.cpp | 4 ++-- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/PathOrderOptimizer.h b/include/PathOrderOptimizer.h index ae7591db45..0406ebc52d 100644 --- a/include/PathOrderOptimizer.h +++ b/include/PathOrderOptimizer.h @@ -4,15 +4,7 @@ #ifndef PATHORDEROPTIMIZER_H #define PATHORDEROPTIMIZER_H -#include "InsetOrderOptimizer.h" // for makeOrderIncludeTransitive -#include "PathOrdering.h" -#include "pathPlanning/CombPath.h" //To calculate the combing distance if we want to use combing. -#include "pathPlanning/LinePolygonsCrossings.h" //To prevent calculating combing distances if we don't cross the combing borders. -#include "settings/EnumSettings.h" //To get the seam settings. -#include "settings/ZSeamConfig.h" //To read the seam configuration. -#include "utils/linearAlg2D.h" //To find the angle of corners to hide seams. -#include "utils/polygonUtils.h" -#include "utils/views/dfs.h" +#include #include #include @@ -23,7 +15,15 @@ #include #include -#include +#include "InsetOrderOptimizer.h" // for makeOrderIncludeTransitive +#include "PathOrdering.h" +#include "pathPlanning/CombPath.h" //To calculate the combing distance if we want to use combing. +#include "pathPlanning/LinePolygonsCrossings.h" //To prevent calculating combing distances if we don't cross the combing borders. +#include "settings/EnumSettings.h" //To get the seam settings. +#include "settings/ZSeamConfig.h" //To read the seam configuration. +#include "utils/linearAlg2D.h" //To find the angle of corners to hide seams. +#include "utils/polygonUtils.h" +#include "utils/views/dfs.h" namespace cura { diff --git a/include/infill.h b/include/infill.h index 289a0850bb..ccea0c71a9 100644 --- a/include/infill.h +++ b/include/infill.h @@ -4,6 +4,10 @@ #ifndef INFILL_H #define INFILL_H +#include + +#include + #include "infill/LightningGenerator.h" #include "infill/ZigzagConnectorProcessor.h" #include "settings/EnumSettings.h" //For infill types. @@ -14,10 +18,6 @@ #include "utils/IntPoint.h" #include "utils/section_type.h" -#include - -#include - namespace cura { diff --git a/src/SkeletalTrapezoidationGraph.cpp b/src/SkeletalTrapezoidationGraph.cpp index 4657b8ee97..5410960b46 100644 --- a/src/SkeletalTrapezoidationGraph.cpp +++ b/src/SkeletalTrapezoidationGraph.cpp @@ -3,12 +3,12 @@ #include "SkeletalTrapezoidationGraph.h" -#include "utils/linearAlg2D.h" -#include "utils/macros.h" +#include #include -#include +#include "utils/linearAlg2D.h" +#include "utils/macros.h" namespace cura { diff --git a/src/gcodeExport.cpp b/src/gcodeExport.cpp index 2ef08a0474..5e37ec6148 100644 --- a/src/gcodeExport.cpp +++ b/src/gcodeExport.cpp @@ -3,6 +3,13 @@ #include "gcodeExport.h" +#include +#include +#include +#include + +#include + #include "Application.h" //To send layer view data. #include "ExtruderTrain.h" #include "PrintFeature.h" @@ -14,13 +21,6 @@ #include "utils/Date.h" #include "utils/string.h" // MMtoStream, PrecisionedDouble -#include - -#include -#include -#include -#include - namespace cura { diff --git a/src/infill.cpp b/src/infill.cpp index 6da3c25c4f..d5850dac08 100644 --- a/src/infill.cpp +++ b/src/infill.cpp @@ -3,6 +3,13 @@ #include "infill.h" +#include //For std::sort. +#include +#include + +#include +#include + #include "WallToolPaths.h" #include "infill/GyroidInfill.h" #include "infill/ImageBasedDensityProvider.h" @@ -21,13 +28,6 @@ #include "utils/linearAlg2D.h" #include "utils/polygonUtils.h" -#include -#include - -#include //For std::sort. -#include -#include - /*! * Function which returns the scanline_idx for a given x coordinate * diff --git a/src/settings/MeshPathConfigs.cpp b/src/settings/MeshPathConfigs.cpp index d91595ce37..635b044db4 100644 --- a/src/settings/MeshPathConfigs.cpp +++ b/src/settings/MeshPathConfigs.cpp @@ -3,11 +3,11 @@ #include "settings/MeshPathConfigs.h" +#include + #include "ExtruderTrain.h" #include "PrintFeature.h" -#include - namespace cura { diff --git a/src/skin.cpp b/src/skin.cpp index 28fc60c238..554d3b9750 100644 --- a/src/skin.cpp +++ b/src/skin.cpp @@ -3,6 +3,8 @@ #include "skin.h" +#include // std::ceil + #include "Application.h" //To get settings. #include "ExtruderTrain.h" #include "Slice.h" @@ -15,8 +17,6 @@ #include "utils/math.h" #include "utils/polygonUtils.h" -#include // std::ceil - #define MIN_AREA_SIZE (0.4 * 0.4) namespace cura