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/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 7f04a12..932279c 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -4,9 +4,9 @@ on: [push,pull_request] jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@edd0a4350396f533e9ec3755ed6c5af5ddfedb97 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@4692ae49d371162144705c1f207beb4f025b9cf5 python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@edd0a4350396f533e9ec3755ed6c5af5ddfedb97 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@4692ae49d371162144705c1f207beb4f025b9cf5 secrets: pypi_password: ${{ secrets.pypi_password }} 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 diff --git a/include/itkExpandWithZerosImageFilter.h b/include/itkExpandWithZerosImageFilter.h index a9ea076..ef0d7c5 100644 --- a/include/itkExpandWithZerosImageFilter.h +++ b/include/itkExpandWithZerosImageFilter.h @@ -75,7 +75,7 @@ class ExpandWithZerosImageFilter : public ImageToImageFilter; /** Run-time type information (and related methods). */ - itkTypeMacro(FrequencyFunction, SpatialFunction); + itkOverrideGetNameOfClassMacro(FrequencyFunction); /** Input type for the function. */ using InputType = typename Superclass::InputType; diff --git a/include/itkFrequencyShrinkImageFilter.h b/include/itkFrequencyShrinkImageFilter.h index e4513e0..30faab0 100644 --- a/include/itkFrequencyShrinkImageFilter.h +++ b/include/itkFrequencyShrinkImageFilter.h @@ -88,7 +88,7 @@ class FrequencyShrinkImageFilter : public ImageToImageFilter; /** Run-time type information (and related methods). */ - itkTypeMacro(IsotropicFrequencyFunction, FrequencyFunction); + itkOverrideGetNameOfClassMacro(IsotropicFrequencyFunction); /** Input type for the function. */ using InputType = typename Superclass::InputType; diff --git a/include/itkIsotropicWaveletFrequencyFunction.h b/include/itkIsotropicWaveletFrequencyFunction.h index 77a9655..e113550 100644 --- a/include/itkIsotropicWaveletFrequencyFunction.h +++ b/include/itkIsotropicWaveletFrequencyFunction.h @@ -66,7 +66,7 @@ class IsotropicWaveletFrequencyFunction : public IsotropicFrequencyFunction; /** Run-time type information (and related methods). */ - itkTypeMacro(IsotropicWaveletFrequencyFunction, IsotropicFrequencyFunction); + itkOverrideGetNameOfClassMacro(IsotropicWaveletFrequencyFunction); /** Input type for the function. */ using InputType = typename Superclass::InputType; diff --git a/include/itkMonogenicSignalFrequencyImageFilter.h b/include/itkMonogenicSignalFrequencyImageFilter.h index 14c83f8..3555970 100644 --- a/include/itkMonogenicSignalFrequencyImageFilter.h +++ b/include/itkMonogenicSignalFrequencyImageFilter.h @@ -61,7 +61,7 @@ class MonogenicSignalFrequencyImageFilter itkNewMacro(Self); /** Runtime information support. */ - itkTypeMacro(MonogenicSignalFrequencyImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(MonogenicSignalFrequencyImageFilter); #ifdef ITK_USE_CONCEPT_CHECKING /// This ensure that InputPixelType is complex diff --git a/include/itkPhaseAnalysisImageFilter.h b/include/itkPhaseAnalysisImageFilter.h index affcb7e..c9cc995 100644 --- a/include/itkPhaseAnalysisImageFilter.h +++ b/include/itkPhaseAnalysisImageFilter.h @@ -80,7 +80,7 @@ class PhaseAnalysisImageFilter : public ImageToImageFilter::ComputeSteerableMatrix() tmpValidIndices.push_back(tmp); } } // end new k indices - } // end partial valid index + } // end partial valid index kValidIndices = tmpValidIndices; } // end combinations @@ -402,8 +402,8 @@ RieszRotationMatrix::ComputeSteerableMatrix() std::cout << std::endl; } } // end Debug - } // end j - } // end i + } // end j + } // end i // ----- PRINT ---- // // Print allIndicesPairs diff --git a/include/itkRieszUtilities.h b/include/itkRieszUtilities.h index 46ec2ee..c8d6ae6 100644 --- a/include/itkRieszUtilities.h +++ b/include/itkRieszUtilities.h @@ -105,7 +105,7 @@ ComputeUniqueIndices(TIndicesArrayType */ template ITK_TEMPLATE_EXPORT std::set> - ComputeAllPermutations(const std::set> & uniqueIndices) +ComputeAllPermutations(const std::set> & uniqueIndices) { using SetType = std::set>; SetType out; diff --git a/include/itkShannonIsotropicWavelet.h b/include/itkShannonIsotropicWavelet.h index 228ba3a..c55167f 100644 --- a/include/itkShannonIsotropicWavelet.h +++ b/include/itkShannonIsotropicWavelet.h @@ -59,7 +59,7 @@ class ShannonIsotropicWavelet : public IsotropicWaveletFrequencyFunction; * Note that bands and levels are always >= 1. The level/bands returned here corresponds to an index. */ IsotropicWavelets_EXPORT IndexPairType - IndexToLevelBandSteerablePyramid(unsigned int linearIndex, unsigned int levels, unsigned int bands); +IndexToLevelBandSteerablePyramid(unsigned int linearIndex, unsigned int levels, unsigned int bands); /** Compute max number of levels depending on the size of the image. * Return J: $ J = \text{min_element}\{J_0,\ldots, J_d\} $; diff --git a/include/itkZeroDCImageFilter.h b/include/itkZeroDCImageFilter.h index 4ed357c..8719ddc 100644 --- a/include/itkZeroDCImageFilter.h +++ b/include/itkZeroDCImageFilter.h @@ -53,7 +53,7 @@ class ZeroDCImageFilter : public ImageToImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ - itkTypeMacro(ZeroDCImageFilter, ImageToImageFilter); + itkOverrideGetNameOfClassMacro(ZeroDCImageFilter); /** Typedef to describe the output image region type. */ using ImageRegionType = typename TImageType::RegionType; diff --git a/pyproject.toml b/pyproject.toml index 5f298d1..21bd210 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "itk-isotropicwavelets" -version = "0.7.0" +version = "0.7.1" description = "Steerable Wavelet Pyramid with Isotropic Wavelets and Riesz Functions" readme = "README.rst" license = {file = "LICENSE"} @@ -38,7 +38,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: Medical Science Apps.", "Topic :: Software Development :: Libraries", ] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ "itk == 5.4.*", ] diff --git a/test/itkWaveletUtilitiesTest.cxx b/test/itkWaveletUtilitiesTest.cxx index f8464c3..c63de52 100644 --- a/test/itkWaveletUtilitiesTest.cxx +++ b/test/itkWaveletUtilitiesTest.cxx @@ -43,10 +43,11 @@ IndexToLevelBandTest(const unsigned int & linearIndex, } } -void printComputeMaxNumberOfLevelsError(itk::Size<3> inputSize, - unsigned int scaleFactor, - unsigned int expected, - unsigned int result) +void +printComputeMaxNumberOfLevelsError(itk::Size<3> inputSize, + unsigned int scaleFactor, + unsigned int expected, + unsigned int result) { std::cerr << "Error in ComputeMaxNumberOfLevels with" << std::endl; std::cerr << "scaleFactor = " << scaleFactor << std::endl;