From 0ac22ed6256cd4a629aeb5c6593ac3ce73e83cde Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 26 Jan 2025 12:55:35 -0600 Subject: [PATCH 1/8] STYLE: CoordRepType -> CoordinateType code readability For the sake of code readability, a new 'CoordinateType' alias is added for each nested 'CoordRepType' alias. The old 'CoordRepType' aliases will still be available with ITK 6.0, but it is recommended to use 'CoordinateType' instead. The 'CoordRepType' aliases will be removed when 'ITK_FUTURE_LEGACY_REMOVE' is enabled. Similarly, 'InputCoordinateType', 'OutputCoordinateType', and 'ImagePointCoordinateType' replace 'InputCoordRepType', 'OutputCoordRepType', and 'ImagePointCoordRepType', respectively. --- include/itkAdditiveGaussianNoiseMeshFilter.h | 14 +++++++------- .../itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h | 14 +++++++------- test/itkAdditiveGaussianNoiseMeshFilterTest.cxx | 4 ++-- ...AdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/itkAdditiveGaussianNoiseMeshFilter.h b/include/itkAdditiveGaussianNoiseMeshFilter.h index a1bbdf0..6ced55d 100644 --- a/include/itkAdditiveGaussianNoiseMeshFilter.h +++ b/include/itkAdditiveGaussianNoiseMeshFilter.h @@ -56,7 +56,7 @@ class AdditiveGaussianNoiseMeshFilter : public MeshToMeshFilter using OutputMeshPointer = typename OutputMeshType::Pointer; /** Type for representing coordinates. */ - using CoordRepType = typename TInput::CoordRepType; + using CoordinateType = typename TInput::CoordinateType; /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -65,12 +65,12 @@ class AdditiveGaussianNoiseMeshFilter : public MeshToMeshFilter itkOverrideGetNameOfClassMacro(AdditiveGaussianNoiseMeshFilter); /** Mean of noise. */ - itkGetConstMacro(Mean, CoordRepType); - itkSetMacro(Mean, CoordRepType); + itkGetConstMacro(Mean, CoordinateType); + itkSetMacro(Mean, CoordinateType); /** Variance of noise. */ - itkGetConstMacro(Sigma, CoordRepType); - itkSetMacro(Sigma, CoordRepType); + itkGetConstMacro(Sigma, CoordinateType); + itkSetMacro(Sigma, CoordinateType); /** Initialization seed. */ itkGetConstMacro(Seed, int); @@ -87,8 +87,8 @@ class AdditiveGaussianNoiseMeshFilter : public MeshToMeshFilter void GenerateData() override; - CoordRepType m_Mean; - CoordRepType m_Sigma; + CoordinateType m_Mean; + CoordinateType m_Sigma; int m_Seed; }; diff --git a/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h b/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h index a1dbc19..362d512 100644 --- a/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h +++ b/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h @@ -50,7 +50,7 @@ class AdditiveGaussianNoiseQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMes using ConstPointer = SmartPointer; /** Type for representing coordinates. */ - using CoordRepType = typename TInputMesh::CoordRepType; + using CoordinateType = typename TInputMesh::CoordinateType; /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -59,12 +59,12 @@ class AdditiveGaussianNoiseQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMes itkOverrideGetNameOfClassMacro(AdditiveGaussianNoiseQuadEdgeMeshFilter); /** Mean of noise. */ - itkGetConstMacro(Mean, CoordRepType); - itkSetMacro(Mean, CoordRepType); + itkGetConstMacro(Mean, CoordinateType); + itkSetMacro(Mean, CoordinateType); /** Variance of noise. */ - itkGetConstMacro(Sigma, CoordRepType); - itkSetMacro(Sigma, CoordRepType); + itkGetConstMacro(Sigma, CoordinateType); + itkSetMacro(Sigma, CoordinateType); /** Initialization seed. */ itkGetConstMacro(Seed, int); @@ -81,8 +81,8 @@ class AdditiveGaussianNoiseQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMes void GenerateData() override; - CoordRepType m_Mean; - CoordRepType m_Sigma; + CoordinateType m_Mean; + CoordinateType m_Sigma; int m_Seed; }; diff --git a/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx b/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx index a15e559..5aa90f8 100644 --- a/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx +++ b/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx @@ -43,8 +43,8 @@ itkAdditiveGaussianNoiseMeshFilterTest(int itkNotUsed(argc), char * itkNotUsed(a constexpr double SPHERE_SCALE = 10.0; constexpr int NOISE_SEED = 100; - const TMesh::CoordRepType NOISE_SIGMA = SPHERE_SCALE * 0.01; - constexpr TMesh::CoordRepType NOISE_MEAN = 1.0; + const TMesh::CoordinateType NOISE_SIGMA = SPHERE_SCALE * 0.01; + constexpr TMesh::CoordinateType NOISE_MEAN = 1.0; /////////// // Logic // diff --git a/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx b/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx index b126e64..4ce37f2 100644 --- a/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx +++ b/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx @@ -43,8 +43,8 @@ itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest(int itkNotUsed(argc), char * itkN constexpr double SPHERE_SCALE = 10.0; constexpr int NOISE_SEED = 100; - const TMesh::CoordRepType NOISE_SIGMA = SPHERE_SCALE * 0.01; - constexpr TMesh::CoordRepType NOISE_MEAN = 1.0; + const TMesh::CoordinateType NOISE_SIGMA = SPHERE_SCALE * 0.01; + constexpr TMesh::CoordinateType NOISE_MEAN = 1.0; /////////// // Logic // From d17d691b8373c53efaed8c2871a5b03cc4269cab Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 26 Jan 2025 13:03:26 -0600 Subject: [PATCH 2/8] COMP: Match scale setting from vector MeshNoise/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx:56:20: error: no viable conversion from 'const double' to 'VectorType' (aka 'Vector') 56 | sphere->SetScale(SPHERE_SCALE); | ^~~~~~~~~~~~ --- test/itkAdditiveGaussianNoiseMeshFilterTest.cxx | 4 ++-- test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx b/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx index 5aa90f8..24b043d 100644 --- a/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx +++ b/test/itkAdditiveGaussianNoiseMeshFilterTest.cxx @@ -42,7 +42,7 @@ itkAdditiveGaussianNoiseMeshFilterTest(int itkNotUsed(argc), char * itkNotUsed(a constexpr int SPHERE_RESOLUTION = 5; constexpr double SPHERE_SCALE = 10.0; - constexpr int NOISE_SEED = 100; + constexpr int NOISE_SEED = 100; const TMesh::CoordinateType NOISE_SIGMA = SPHERE_SCALE * 0.01; constexpr TMesh::CoordinateType NOISE_MEAN = 1.0; @@ -53,7 +53,7 @@ itkAdditiveGaussianNoiseMeshFilterTest(int itkNotUsed(argc), char * itkNotUsed(a TSphere::Pointer sphere = TSphere::New(); sphere->SetResolution(SPHERE_RESOLUTION); - sphere->SetScale(SPHERE_SCALE); + sphere->SetScale(TSphere::VectorType(SPHERE_SCALE)); TNoise::Pointer noise = TNoise::New(); diff --git a/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx b/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx index 4ce37f2..8f39347 100644 --- a/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx +++ b/test/itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest.cxx @@ -42,7 +42,7 @@ itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest(int itkNotUsed(argc), char * itkN constexpr int SPHERE_RESOLUTION = 5; constexpr double SPHERE_SCALE = 10.0; - constexpr int NOISE_SEED = 100; + constexpr int NOISE_SEED = 100; const TMesh::CoordinateType NOISE_SIGMA = SPHERE_SCALE * 0.01; constexpr TMesh::CoordinateType NOISE_MEAN = 1.0; @@ -53,7 +53,7 @@ itkAdditiveGaussianNoiseQuadEdgeMeshFilterTest(int itkNotUsed(argc), char * itkN TSphere::Pointer sphere = TSphere::New(); sphere->SetResolution(SPHERE_RESOLUTION); - sphere->SetScale(SPHERE_SCALE); + sphere->SetScale(TSphere::VectorType(SPHERE_SCALE)); TNoise::Pointer noise = TNoise::New(); From 23e83145d25a9198d5e9d317ef5b3f22ef4101b5 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Mon, 27 Jan 2025 17:53:54 -0600 Subject: [PATCH 3/8] STYLE: Update to match clang-format-19 from ITK --- .clang-format | 251 +++++++++++++++--- include/itkAdditiveGaussianNoiseMeshFilter.h | 2 +- ...kAdditiveGaussianNoiseQuadEdgeMeshFilter.h | 2 +- 3 files changed, 211 insertions(+), 44 deletions(-) diff --git a/.clang-format b/.clang-format index 411b009..45b9502 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,4 @@ -## This config file is only relevant for clang-format version 8.0.0 +## This config file is only relevant for clang-format version 19.1.4 ## ## Examples of each format style can be found on the in the clang-format documentation ## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option @@ -10,142 +10,309 @@ ## maintaining a consistent code style. ## ## EXAMPLE apply code style enforcement before commit: -# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_8.0.0} --modified +# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.4} --modified ## EXAMPLE apply code style enforcement after commit: -# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_8.0.0} --last +# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.4} --last --- -# This configuration requires clang-format version 8.0.0 exactly. -BasedOnStyle: Mozilla +# This configuration requires clang-format version 19.1.4 exactly. Language: Cpp AccessModifierOffset: -2 AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: true -AlignEscapedNewlines: Right -AlignOperands: true -AlignTrailingComments: true -# clang 9.0 AllowAllArgumentsOnNextLine: true -# clang 9.0 AllowAllConstructorInitializersOnNextLine: true +AlignArrayOfStructures: None +AlignConsecutiveAssignments: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: true +AlignConsecutiveBitFields: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveDeclarations: + Enabled: true + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: true +AlignConsecutiveMacros: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveShortCaseStatements: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCaseArrows: false + AlignCaseColons: false +AlignConsecutiveTableGenBreakingDAGArgColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveTableGenCondOperatorColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveTableGenDefinitionColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignEscapedNewlines: Left +AlignOperands: Align +AlignTrailingComments: + Kind: Always + OverEmptyLines: 0 +AllowAllArgumentsOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: false -AllowShortBlocksOnASingleLine: false +AllowBreakBeforeNoexceptSpecifier: Never +AllowShortBlocksOnASingleLine: Never +AllowShortCaseExpressionOnASingleLine: true AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: Inline -# clang 9.0 AllowShortLambdasOnASingleLine: All -# clang 9.0 features AllowShortIfStatementsOnASingleLine: Never -AllowShortIfStatementsOnASingleLine: false +AllowShortCompoundRequirementOnASingleLine: true +AllowShortEnumsOnASingleLine: true +#AllowShortFunctionsOnASingleLine: Inline Only merge functions defined inside a class. Implies empty. +#AllowShortFunctionsOnASingleLine: None (in configuration: None) Never merge functions into a single line. +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Never +AllowShortLambdasOnASingleLine: All AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: All AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: Yes +AttributeMacros: + - __capability BinPackArguments: false BinPackParameters: false -BreakBeforeBraces: Custom +BitFieldColonSpacing: Both BraceWrapping: - # clang 9.0 feature AfterCaseLabel: false + AfterCaseLabel: true AfterClass: true - AfterControlStatement: true + AfterControlStatement: Always AfterEnum: true + AfterExternBlock: true AfterFunction: true AfterNamespace: true AfterObjCDeclaration: true AfterStruct: true AfterUnion: true - AfterExternBlock: true BeforeCatch: true BeforeElse: true -## This is the big change from historical ITK formatting! -# Historically ITK used a style similar to https://en.wikipedia.org/wiki/Indentation_style#Whitesmiths_style -# with indented braces, and not indented code. This style is very difficult to automatically -# maintain with code beautification tools. Not indenting braces is more common among -# formatting tools. + BeforeLambdaBody: false + BeforeWhile: false IndentBraces: false SplitEmptyFunction: false SplitEmptyRecord: false SplitEmptyNamespace: false +BreakAdjacentStringLiterals: true +BreakAfterAttributes: Leave +BreakAfterJavaFieldAnnotations: false +BreakAfterReturnType: All +BreakArrays: true BreakBeforeBinaryOperators: None -#clang 6.0 BreakBeforeInheritanceComma: true -BreakInheritanceList: BeforeComma +BreakBeforeConceptDeclarations: Always +BreakBeforeBraces: Custom +BreakBeforeInlineASMColon: OnlyMultiline BreakBeforeTernaryOperators: true -#clang 6.0 BreakConstructorInitializersBeforeComma: true BreakConstructorInitializers: BeforeComma -BreakAfterJavaFieldAnnotations: false +BreakFunctionDefinitionParameters: false +BreakInheritanceList: BeforeComma BreakStringLiterals: true +BreakTemplateDeclarations: Yes ## The following line allows larger lines in non-documentation code ColumnLimit: 120 CommentPragmas: '^ IWYU pragma:' CompactNamespaces: false -ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 2 ContinuationIndentWidth: 2 Cpp11BracedListStyle: false DerivePointerAlignment: false DisableFormat: false +EmptyLineAfterAccessModifier: Never +EmptyLineBeforeAccessModifier: LogicalBlock ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH +IfMacros: + - KJ_IF_MAYBE IncludeBlocks: Preserve IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 + SortPriority: 0 + CaseSensitive: false - Regex: '^(<|"(gtest|gmock|isl|json)/)' Priority: 3 + SortPriority: 0 + CaseSensitive: false - Regex: '.*' Priority: 1 + SortPriority: 0 + CaseSensitive: false IncludeIsMainRegex: '(Test)?$' +IncludeIsMainSourceRegex: '' +IndentAccessModifiers: false +IndentCaseBlocks: false IndentCaseLabels: true +IndentExternBlock: AfterExternBlock +IndentGotoLabels: true IndentPPDirectives: AfterHash +IndentRequiresClause: true IndentWidth: 2 IndentWrappedFunctionNames: false +InsertBraces: false +InsertNewlineAtEOF: false +InsertTrailingCommas: None +IntegerLiteralSeparator: + Binary: 0 + BinaryMinDigits: 0 + Decimal: 0 + DecimalMinDigits: 0 + Hex: 0 + HexMinDigits: 0 JavaScriptQuotes: Leave JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: true +KeepEmptyLines: + AtEndOfFile: false + AtStartOfBlock: true + AtStartOfFile: true +LambdaBodyIndentation: Signature +LineEnding: DeriveLF MacroBlockBegin: '' MacroBlockEnd: '' +MainIncludeChar: Quote MaxEmptyLinesToKeep: 2 NamespaceIndentation: None ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 +ObjCBreakBeforeNestedBlockParam: true ObjCSpaceAfterProperty: true ObjCSpaceBeforeProtocolList: false +PackConstructorInitializers: BinPack PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 ## The following line allows larger lines in non-documentation code PenaltyBreakFirstLessLess: 120 +PenaltyBreakOpenParenthesis: 0 +PenaltyBreakScopeResolution: 500 PenaltyBreakString: 1000 PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 +PenaltyIndentedWhitespace: 0 PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Middle +PPIndentWidth: -1 +QualifierAlignment: Custom +QualifierOrder: + - friend + - static + - inline + - constexpr + - const + - type +ReferenceAlignment: Pointer ReflowComments: true +RemoveBracesLLVM: false +RemoveParentheses: Leave +RemoveSemicolon: false +RequiresClausePosition: OwnLine +RequiresExpressionIndentation: OuterScope +SeparateDefinitionBlocks: Leave +ShortNamespaceLines: 1 +SkipMacroDefinitionBody: false # We may want to sort the includes as a separate pass -SortIncludes: false +SortIncludes: Never +SortJavaStaticImport: Before # We may want to revisit this later -SortUsingDeclarations: false +SortUsingDeclarations: Never SpaceAfterCStyleCast: false -# SpaceAfterLogicalNot: false +SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: true +SpaceAroundPointerQualifiers: Default SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false SpaceBeforeCpp11BracedList: false SpaceBeforeCtorInitializerColon: true SpaceBeforeInheritanceColon: true +SpaceBeforeJsonColon: false SpaceBeforeParens: ControlStatements +SpaceBeforeParensOptions: + AfterControlStatements: true + AfterForeachMacros: true + AfterFunctionDefinitionName: false + AfterFunctionDeclarationName: false + AfterIfMacros: true + AfterOverloadedOperator: false + AfterPlacementOperator: true + AfterRequiresInClause: false + AfterRequiresInExpression: false + BeforeNonEmptyParentheses: false SpaceBeforeRangeBasedForLoopColon: true -SpaceInEmptyParentheses: false +SpaceBeforeSquareBrackets: false +SpaceInEmptyBlock: false SpacesBeforeTrailingComments: 1 -SpacesInAngles: false +SpacesInAngles: Never SpacesInContainerLiterals: false -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false +SpacesInLineCommentPrefix: + Minimum: 1 + Maximum: -1 +SpacesInParens: Never +SpacesInParensOptions: + ExceptDoubleParentheses: false + InCStyleCasts: false + InConditionalStatements: false + InEmptyParentheses: false + Other: false SpacesInSquareBrackets: false -Standard: Cpp11 +Standard: Latest +StatementAttributeLikeMacros: + - Q_EMIT StatementMacros: - Q_UNUSED - QT_REQUIRE_VERSION + - ITK_GCC_PRAGMA_PUSH + - ITK_GCC_PRAGMA_POP + - ITK_GCC_SUPPRESS_Wfloat_equal + - ITK_GCC_SUPPRESS_Wformat_nonliteral + - ITK_GCC_SUPPRESS_Warray_bounds + - ITK_CLANG_PRAGMA_PUSH + - ITK_CLANG_PRAGMA_POP + - ITK_CLANG_SUPPRESS_Wzero_as_null_pointer_constant + - CLANG_PRAGMA_PUSH + - CLANG_PRAGMA_POP + - CLANG_SUPPRESS_Wfloat_equal + - INTEL_PRAGMA_WARN_PUSH + - INTEL_PRAGMA_WARN_POP + - INTEL_SUPPRESS_warning_1292 + - itkTemplateFloatingToIntegerMacro + - itkLegacyMacro +TableGenBreakInsideDAGArg: DontBreak TabWidth: 2 UseTab: Never +VerilogBreakBetweenInstancePorts: true +WhitespaceSensitiveMacros: + - BOOST_PP_STRINGIZE + - CF_SWIFT_NAME + - NS_SWIFT_NAME + - PP_STRINGIZE + - STRINGIZE ... diff --git a/include/itkAdditiveGaussianNoiseMeshFilter.h b/include/itkAdditiveGaussianNoiseMeshFilter.h index 6ced55d..7d56cd9 100644 --- a/include/itkAdditiveGaussianNoiseMeshFilter.h +++ b/include/itkAdditiveGaussianNoiseMeshFilter.h @@ -89,7 +89,7 @@ class AdditiveGaussianNoiseMeshFilter : public MeshToMeshFilter CoordinateType m_Mean; CoordinateType m_Sigma; - int m_Seed; + int m_Seed; }; } // namespace itk diff --git a/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h b/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h index 362d512..a106096 100644 --- a/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h +++ b/include/itkAdditiveGaussianNoiseQuadEdgeMeshFilter.h @@ -83,7 +83,7 @@ class AdditiveGaussianNoiseQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMes CoordinateType m_Mean; CoordinateType m_Sigma; - int m_Seed; + int m_Seed; }; } // end namespace itk From 5019ba2494d7a32699f5c757b17bef826df0144b Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Tue, 11 Mar 2025 17:41:43 -0500 Subject: [PATCH 4/8] ENH: Update pyproject.toml for ITK 5.4.2 In preparation for release. Ensure that cmake is 3.16.3 or greater to match v5.4.2 minimum requirements. Set minimum python to 3.9 Increment version number. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f9c35fe..2b02a4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "itk-meshnoise" -version = "1.0.0" +version = "1.0.1" description = "Classes to perturb mesh objects with Gaussian noise" readme = "README.rst" license = {file = "LICENSE"} @@ -36,7 +36,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: Medical Science Apps.", "Topic :: Software Development :: Libraries", ] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ "itk == 5.4.*", ] From fd88c88fbbc7405cc93e121f6401791ee18c44e3 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Mon, 27 Jan 2025 21:18:50 -0600 Subject: [PATCH 5/8] ENH: Update to support the clang-format-linter CI --- .github/workflows/clang-format-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index 69166d9..630ae57 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: fetch-depth: 1 - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master From 74a46c6977985916367489f85a36a40a0a5c8a5c Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 9 Mar 2025 10:49:01 -0500 Subject: [PATCH 6/8] ENH: Use tag v5.4.2 for the build packages tags Set the default build package tags to v5.4.2 for capturing the ITKRemoteModuleBuildTestPackageAction shared scripts. This pulls the default configuration items needed to build against ITK version v5.4.2. --- .github/workflows/build-test-package.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 19b97f5..1e0bda2 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -1,14 +1,13 @@ - name: Build, test, package on: [push,pull_request] jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.2 python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.2 with: test-notebooks: false secrets: From 0a3a3fb1623b82dc8d4a685046ba42d99abd9a42 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 16 Mar 2025 12:41:34 -0500 Subject: [PATCH 7/8] ENH: Update to newer minimum cmake versions Match the ITK version minimum requirements for cmake. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe05b79..ec16b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ -cmake_minimum_required(VERSION 3.10.2) +cmake_minimum_required(VERSION 3.22.1...3.29.0 FATAL_ERROR) + project(MeshNoise) From f646c509b56cb0d9e922759618842b53c8fdfe41 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 16 Mar 2025 13:05:16 -0500 Subject: [PATCH 8/8] ENH: Update minimum cmake version to 3.16.3 Match version for ITK v5.4.2 --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec16b03..b2a28c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ -cmake_minimum_required(VERSION 3.22.1...3.29.0 FATAL_ERROR) - +cmake_minimum_required(VERSION 3.16.3) project(MeshNoise)