diff --git a/Common/ImageSamplers/itkImageRandomCoordinateSampler.h b/Common/ImageSamplers/itkImageRandomCoordinateSampler.h index 6d4a464f1..fc7c190bc 100644 --- a/Common/ImageSamplers/itkImageRandomCoordinateSampler.h +++ b/Common/ImageSamplers/itkImageRandomCoordinateSampler.h @@ -79,10 +79,10 @@ class ITK_TEMPLATE_EXPORT ImageRandomCoordinateSampler : public ImageRandomSampl /** This image sampler samples the image on physical coordinates and thus * needs an interpolator. */ - using CoordRepType = double; - using InterpolatorType = InterpolateImageFunction; + using CoordinateType = double; + using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; - using DefaultInterpolatorType = BSplineInterpolateImageFunction; + using DefaultInterpolatorType = BSplineInterpolateImageFunction; /** The random number generator used to generate random coordinates. */ using RandomGeneratorType = itk::Statistics::MersenneTwisterRandomVariateGenerator; diff --git a/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.h b/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.h index f34114ade..fe76fdb29 100644 --- a/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.h +++ b/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.h @@ -79,10 +79,10 @@ class ITK_TEMPLATE_EXPORT MultiInputImageRandomCoordinateSampler : public ImageR /** This image sampler samples the image on physical coordinates and thus * needs an interpolator. */ - using CoordRepType = double; - using InterpolatorType = InterpolateImageFunction; + using CoordinateType = double; + using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; - using DefaultInterpolatorType = BSplineInterpolateImageFunction; + using DefaultInterpolatorType = BSplineInterpolateImageFunction; /** The random number generator used to generate random coordinates. */ using RandomGeneratorType = itk::Statistics::MersenneTwisterRandomVariateGenerator; diff --git a/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.hxx b/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.hxx index 8b3dc150f..ba109b42f 100644 --- a/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.hxx +++ b/Common/ImageSamplers/itkMultiInputImageRandomCoordinateSampler.hxx @@ -198,8 +198,9 @@ MultiInputImageRandomCoordinateSampler::GenerateSampleRegion( /** Convert to continuous index in input image 0. */ smallestPoint = dir0 * smallestPoint; largestPoint = dir0 * largestPoint; - smallestContIndex = this->GetInput(0)->template TransformPhysicalPointToContinuousIndex(smallestPoint); - largestContIndex = this->GetInput(0)->template TransformPhysicalPointToContinuousIndex(largestPoint); + smallestContIndex = + this->GetInput(0)->template TransformPhysicalPointToContinuousIndex(smallestPoint); + largestContIndex = this->GetInput(0)->template TransformPhysicalPointToContinuousIndex(largestPoint); /** Support for localised mutual information. */ if (this->GetUseRandomSampleRegion()) diff --git a/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.h b/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.h index 7803192d4..40f300ff3 100644 --- a/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.h +++ b/Common/OpenCL/Filters/itkGPUInterpolateImageFunction.h @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT GPUInterpolateImageFunction /** Superclass typedef support. */ using InputImageType = typename CPUSuperclass::InputImageType; using ContinuousIndexType = typename CPUSuperclass::ContinuousIndexType; - using CoordRepType = typename CPUSuperclass::CoordRepType; + using CoordinateType = typename CPUSuperclass::CoordinateType; protected: GPUInterpolateImageFunction(); diff --git a/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h b/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h index d3465b352..33e6f3bbe 100644 --- a/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h +++ b/Common/OpenCL/Filters/itkGPUInterpolatorCopier.h @@ -61,7 +61,7 @@ namespace itk * * \ingroup GPUCommon */ -template +template class ITK_TEMPLATE_EXPORT GPUInterpolatorCopier : public Object { public: @@ -83,18 +83,18 @@ class ITK_TEMPLATE_EXPORT GPUInterpolatorCopier : public Object using CPUInterpolatorType = TInterpolator; using CPUInterpolatorConstPointer = typename CPUInterpolatorType::ConstPointer; using CPUInputImageType = typename CPUInterpolatorType::InputImageType; - using CPUCoordRepType = typename CPUInterpolatorType::CoordRepType; - using GPUCoordRepType = TOutputCoordRep; + using CPUCoordinateType = typename CPUInterpolatorType::CoordinateType; + using GPUCoordinateType = TOutputCoordinate; /** Typedef's for non explicit GPU interpolator definitions. */ - using GPUInterpolatorType = InterpolateImageFunction; + using GPUInterpolatorType = InterpolateImageFunction; using GPUInterpolatorPointer = typename GPUInterpolatorType::Pointer; using GPUInterpolatorConstPointer = typename GPUInterpolatorType::ConstPointer; /** Typedef's for explicit GPU interpolator definitions. */ using CPUInputImagePixelType = typename CPUInputImageType::PixelType; using GPUInputImageType = itk::GPUImage; - using GPUExplicitInterpolatorType = InterpolateImageFunction; + using GPUExplicitInterpolatorType = InterpolateImageFunction; using GPUExplicitInterpolatorPointer = typename GPUExplicitInterpolatorType::Pointer; using GPUExplicitInterpolatorConstPointer = typename GPUExplicitInterpolatorType::ConstPointer; @@ -123,7 +123,7 @@ class ITK_TEMPLATE_EXPORT GPUInterpolatorCopier : public Object #ifdef ITK_USE_CONCEPT_CHECKING // Begin concept checking - itkConceptMacro(OutputCoordRepIsFloatingPointCheck, (Concept::IsFloatingPoint)); + itkConceptMacro(OutputCoordinateIsFloatingPointCheck, (Concept::IsFloatingPoint)); // End concept checking #endif diff --git a/Common/OpenCL/Filters/itkGPUInterpolatorCopier.hxx b/Common/OpenCL/Filters/itkGPUInterpolatorCopier.hxx index 21439db99..28f71d179 100644 --- a/Common/OpenCL/Filters/itkGPUInterpolatorCopier.hxx +++ b/Common/OpenCL/Filters/itkGPUInterpolatorCopier.hxx @@ -37,8 +37,8 @@ namespace itk { //------------------------------------------------------------------------------ -template -GPUInterpolatorCopier::GPUInterpolatorCopier() +template +GPUInterpolatorCopier::GPUInterpolatorCopier() { this->m_InputInterpolator = nullptr; this->m_Output = nullptr; @@ -49,9 +49,9 @@ GPUInterpolatorCopier::G //------------------------------------------------------------------------------ -template +template void -GPUInterpolatorCopier::Update() +GPUInterpolatorCopier::Update() { if (!this->m_InputInterpolator) { @@ -71,7 +71,8 @@ GPUInterpolatorCopier::U this->m_InternalTransformTime = t; // Try Nearest - using NearestNeighborInterpolatorType = NearestNeighborInterpolateImageFunction; + using NearestNeighborInterpolatorType = + NearestNeighborInterpolateImageFunction; const auto nearest = dynamic_cast(m_InputInterpolator.GetPointer()); if (nearest) @@ -80,21 +81,21 @@ GPUInterpolatorCopier::U { // Create GPU NearestNeighbor interpolator in explicit mode using GPUNearestNeighborInterpolatorType = - GPUNearestNeighborInterpolateImageFunction; + GPUNearestNeighborInterpolateImageFunction; this->m_ExplicitOutput = GPUNearestNeighborInterpolatorType::New(); } else { // Create GPU NearestNeighbor interpolator in implicit mode using GPUNearestNeighborInterpolatorType = - NearestNeighborInterpolateImageFunction; + NearestNeighborInterpolateImageFunction; this->m_Output = GPUNearestNeighborInterpolatorType::New(); } return; } // Try Linear - using LinearInterpolatorType = LinearInterpolateImageFunction; + using LinearInterpolatorType = LinearInterpolateImageFunction; const auto linear = dynamic_cast(m_InputInterpolator.GetPointer()); if (linear) @@ -102,23 +103,23 @@ GPUInterpolatorCopier::U if (this->m_ExplicitMode) { // Create GPU Linear interpolator in explicit mode - using GPULinearInterpolatorType = GPULinearInterpolateImageFunction; + using GPULinearInterpolatorType = GPULinearInterpolateImageFunction; this->m_ExplicitOutput = GPULinearInterpolatorType::New(); } else { // Create GPU Linear interpolator in implicit mode - using GPULinearInterpolatorType = LinearInterpolateImageFunction; + using GPULinearInterpolatorType = LinearInterpolateImageFunction; this->m_Output = GPULinearInterpolatorType::New(); } return; } // Try BSpline - using BSplineInterpolatorType = BSplineInterpolateImageFunction; + using BSplineInterpolatorType = BSplineInterpolateImageFunction; const auto bspline = dynamic_cast(m_InputInterpolator.GetPointer()); - using BSplineInterpolatorFloatType = BSplineInterpolateImageFunction; + using BSplineInterpolatorFloatType = BSplineInterpolateImageFunction; const auto bsplineFloat = dynamic_cast(m_InputInterpolator.GetPointer()); if (bspline || bsplineFloat) @@ -141,7 +142,7 @@ GPUInterpolatorCopier::U // Create GPU BSpline interpolator in explicit mode using GPUBSplineInterpolatorType = - GPUBSplineInterpolateImageFunction; + GPUBSplineInterpolateImageFunction; auto bsplineInterpolator = GPUBSplineInterpolatorType::New(); bsplineInterpolator->SetSplineOrder(splineOrder); @@ -155,7 +156,7 @@ GPUInterpolatorCopier::U { // Create GPU BSpline interpolator in implicit mode using GPUBSplineInterpolatorType = - BSplineInterpolateImageFunction; + BSplineInterpolateImageFunction; auto bsplineInterpolator = GPUBSplineInterpolatorType::New(); bsplineInterpolator->SetSplineOrder(splineOrder); this->m_Output = bsplineInterpolator; @@ -172,10 +173,10 @@ GPUInterpolatorCopier::U //------------------------------------------------------------------------------ -template +template void -GPUInterpolatorCopier::PrintSelf(std::ostream & os, - Indent indent) const +GPUInterpolatorCopier::PrintSelf(std::ostream & os, + Indent indent) const { Superclass::PrintSelf(os, indent); os << indent << "Input Interpolator: " << this->m_InputInterpolator << std::endl; diff --git a/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.hxx b/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.hxx index 5e0d094f1..80e175bd6 100644 --- a/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.hxx +++ b/Common/Transforms/itkAdvancedBSplineDeformableTransformBase.hxx @@ -562,7 +562,7 @@ AdvancedBSplineDeformableTransformBase::TransformPoint for (unsigned int j = 0; j < SpaceDimension; ++j) { - cindex[j] = static_cast(cvector[j]); + cindex[j] = static_cast(cvector[j]); } return cindex; } diff --git a/Common/itkMultiResolutionImageRegistrationMethod2.hxx b/Common/itkMultiResolutionImageRegistrationMethod2.hxx index 13385411f..b14b970d9 100644 --- a/Common/itkMultiResolutionImageRegistrationMethod2.hxx +++ b/Common/itkMultiResolutionImageRegistrationMethod2.hxx @@ -217,7 +217,7 @@ MultiResolutionImageRegistrationMethod2::PreparePyram // Instead of copying the shrinking code, we compute image regions from // the result of the fixed image pyramid. using PointType = typename FixedImageType::PointType; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordinateType; PointType inputStartPoint; PointType inputEndPoint; @@ -234,9 +234,9 @@ MultiResolutionImageRegistrationMethod2::PreparePyram * To be on the safe side, the start point is ceiled, and the end point is * floored. To see why, consider an image of 4 by 4, and its downsampled version of 2 by 2. */ const auto startcindex = - fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputStartPoint); + fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputStartPoint); const auto endcindex = - fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputEndPoint); + fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputEndPoint); for (unsigned int dim = 0; dim < TFixedImage::ImageDimension; ++dim) { start[dim] = static_cast(std::ceil(startcindex[dim])); diff --git a/Components/ImageSamplers/MultInputRandomCoordinate/elxMultiInputRandomCoordinateSampler.h b/Components/ImageSamplers/MultInputRandomCoordinate/elxMultiInputRandomCoordinateSampler.h index e17233004..85de6cd1e 100644 --- a/Components/ImageSamplers/MultInputRandomCoordinate/elxMultiInputRandomCoordinateSampler.h +++ b/Components/ImageSamplers/MultInputRandomCoordinate/elxMultiInputRandomCoordinateSampler.h @@ -129,7 +129,7 @@ class ITK_TEMPLATE_EXPORT MultiInputRandomCoordinateSampler /** This image sampler samples the image on physical coordinates and thus * needs an interpolator. */ - using typename Superclass1::CoordRepType; + using typename Superclass1::CoordinateType; using typename Superclass1::InterpolatorType; using typename Superclass1::DefaultInterpolatorType; diff --git a/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.h b/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.h index d860cc8ae..0a0f46120 100644 --- a/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.h +++ b/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.h @@ -122,7 +122,7 @@ class ITK_TEMPLATE_EXPORT RandomCoordinateSampler /** This image sampler samples the image on physical coordinates and thus * needs an interpolator. */ - using typename Superclass1::CoordRepType; + using typename Superclass1::CoordinateType; using typename Superclass1::InterpolatorType; using typename Superclass1::DefaultInterpolatorType; diff --git a/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.hxx b/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.hxx index 39e0e9498..f56664520 100644 --- a/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.hxx +++ b/Components/ImageSamplers/RandomCoordinate/elxRandomCoordinateSampler.hxx @@ -47,7 +47,7 @@ RandomCoordinateSampler::BeforeEachResolution() configuration.ReadParameter(splineOrder, "FixedImageBSplineInterpolationOrder", this->GetComponentLabel(), level, 0); if (splineOrder == 1) { - using LinearInterpolatorType = itk::LinearInterpolateImageFunction; + using LinearInterpolatorType = itk::LinearInterpolateImageFunction; auto fixedImageLinearInterpolator = LinearInterpolatorType::New(); this->SetInterpolator(fixedImageLinearInterpolator); } diff --git a/Components/Interpolators/BSplineInterpolator/elxBSplineInterpolator.h b/Components/Interpolators/BSplineInterpolator/elxBSplineInterpolator.h index 9fcef3f6a..835bab5a5 100644 --- a/Components/Interpolators/BSplineInterpolator/elxBSplineInterpolator.h +++ b/Components/Interpolators/BSplineInterpolator/elxBSplineInterpolator.h @@ -49,7 +49,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT BSplineInterpolator : public itk::BSplineInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType, + typename InterpolatorBase::CoordinateType, double> , // CoefficientType public InterpolatorBase @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT BSplineInterpolator /** Standard ITK-stuff. */ using Self = BSplineInterpolator; using Superclass1 = itk::BSplineInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType, + typename InterpolatorBase::CoordinateType, double>; using Superclass2 = InterpolatorBase; using Pointer = itk::SmartPointer; diff --git a/Components/Interpolators/BSplineInterpolatorFloat/elxBSplineInterpolatorFloat.h b/Components/Interpolators/BSplineInterpolatorFloat/elxBSplineInterpolatorFloat.h index d9433cb93..4eef5cbeb 100644 --- a/Components/Interpolators/BSplineInterpolatorFloat/elxBSplineInterpolatorFloat.h +++ b/Components/Interpolators/BSplineInterpolatorFloat/elxBSplineInterpolatorFloat.h @@ -49,7 +49,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT BSplineInterpolatorFloat : public itk::BSplineInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType, + typename InterpolatorBase::CoordinateType, float> , // CoefficientType public InterpolatorBase @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT BSplineInterpolatorFloat /** Standard ITK-stuff. */ using Self = BSplineInterpolatorFloat; using Superclass1 = itk::BSplineInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType, + typename InterpolatorBase::CoordinateType, float>; using Superclass2 = InterpolatorBase; using Pointer = itk::SmartPointer; diff --git a/Components/Interpolators/LinearInterpolator/elxLinearInterpolator.h b/Components/Interpolators/LinearInterpolator/elxLinearInterpolator.h index bbae1bbfe..88a855da6 100644 --- a/Components/Interpolators/LinearInterpolator/elxLinearInterpolator.h +++ b/Components/Interpolators/LinearInterpolator/elxLinearInterpolator.h @@ -43,7 +43,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT LinearInterpolator : public itk::AdvancedLinearInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType> + typename InterpolatorBase::CoordinateType> , public InterpolatorBase { public: @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT LinearInterpolator /** Standard ITK-stuff. */ using Self = LinearInterpolator; using Superclass1 = itk::AdvancedLinearInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType>; + typename InterpolatorBase::CoordinateType>; using Superclass2 = InterpolatorBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; diff --git a/Components/Interpolators/NearestNeighborInterpolator/elxNearestNeighborInterpolator.h b/Components/Interpolators/NearestNeighborInterpolator/elxNearestNeighborInterpolator.h index fc188a3e6..3fc69af7f 100644 --- a/Components/Interpolators/NearestNeighborInterpolator/elxNearestNeighborInterpolator.h +++ b/Components/Interpolators/NearestNeighborInterpolator/elxNearestNeighborInterpolator.h @@ -41,7 +41,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT NearestNeighborInterpolator : public itk::NearestNeighborInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType> + typename InterpolatorBase::CoordinateType> , public InterpolatorBase { public: @@ -50,7 +50,7 @@ class ITK_TEMPLATE_EXPORT NearestNeighborInterpolator /** Standard ITK-stuff. */ using Self = NearestNeighborInterpolator; using Superclass1 = itk::NearestNeighborInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType>; + typename InterpolatorBase::CoordinateType>; using Superclass2 = InterpolatorBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; diff --git a/Components/Interpolators/RayCastInterpolator/elxRayCastInterpolator.h b/Components/Interpolators/RayCastInterpolator/elxRayCastInterpolator.h index 59efe99c4..18c13aac9 100644 --- a/Components/Interpolators/RayCastInterpolator/elxRayCastInterpolator.h +++ b/Components/Interpolators/RayCastInterpolator/elxRayCastInterpolator.h @@ -43,7 +43,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT RayCastInterpolator : public itk::AdvancedRayCastInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType> + typename InterpolatorBase::CoordinateType> , public InterpolatorBase { public: @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT RayCastInterpolator /** Standard ITK-stuff. */ using Self = RayCastInterpolator; using Superclass1 = itk::AdvancedRayCastInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType>; + typename InterpolatorBase::CoordinateType>; using Superclass2 = InterpolatorBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; @@ -88,14 +88,15 @@ class ITK_TEMPLATE_EXPORT RayCastInterpolator /** Typedef's for CombinationTransform */ using EulerTransformType = - typename itk::EulerTransform::CoordRepType, ImageDimension>; + typename itk::EulerTransform::CoordinateType, ImageDimension>; using TransformParametersType = typename EulerTransformType::ParametersType; using EulerTransformPointer = typename EulerTransformType::Pointer; using AdvancedTransformType = typename itk:: - AdvancedTransform::CoordRepType, Self::ImageDimension, Self::ImageDimension>; + AdvancedTransform::CoordinateType, Self::ImageDimension, Self::ImageDimension>; using AdvancedTransformPointer = typename AdvancedTransformType::Pointer; using CombinationTransformType = - typename itk::AdvancedCombinationTransform::CoordRepType, Self::ImageDimension>; + typename itk::AdvancedCombinationTransform::CoordinateType, + Self::ImageDimension>; using CombinationTransformPointer = typename CombinationTransformType::Pointer; protected: diff --git a/Components/Interpolators/ReducedDimensionBSplineInterpolator/elxReducedDimensionBSplineInterpolator.h b/Components/Interpolators/ReducedDimensionBSplineInterpolator/elxReducedDimensionBSplineInterpolator.h index 90df2a923..afa2bc9ef 100644 --- a/Components/Interpolators/ReducedDimensionBSplineInterpolator/elxReducedDimensionBSplineInterpolator.h +++ b/Components/Interpolators/ReducedDimensionBSplineInterpolator/elxReducedDimensionBSplineInterpolator.h @@ -47,7 +47,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT ReducedDimensionBSplineInterpolator : public itk::ReducedDimensionBSplineInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType, + typename InterpolatorBase::CoordinateType, double> , // CoefficientType public InterpolatorBase @@ -59,7 +59,7 @@ class ITK_TEMPLATE_EXPORT ReducedDimensionBSplineInterpolator using Self = ReducedDimensionBSplineInterpolator; using Superclass1 = itk::ReducedDimensionBSplineInterpolateImageFunction::InputImageType, - typename InterpolatorBase::CoordRepType, + typename InterpolatorBase::CoordinateType, double>; using Superclass2 = InterpolatorBase; using Pointer = itk::SmartPointer; diff --git a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/itkCorrespondingPointsEuclideanDistancePointMetric.hxx b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/itkCorrespondingPointsEuclideanDistancePointMetric.hxx index 50418274a..8dedbec49 100644 --- a/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/itkCorrespondingPointsEuclideanDistancePointMetric.hxx +++ b/Components/Metrics/CorrespondingPointsEuclideanDistanceMetric/itkCorrespondingPointsEuclideanDistancePointMetric.hxx @@ -105,7 +105,7 @@ CorrespondingPointsEuclideanDistancePointMetric MeasureType & value, DerivativeType & derivative) const { - using VnlVectorType = vnl_vector; + using VnlVectorType = vnl_vector; const auto & fixedPoints = this->Superclass::GetFixedPoints(); const auto & movingPoints = this->Superclass::GetMovingPoints(); diff --git a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h index 4f51fd5b4..8508b9be7 100644 --- a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h +++ b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.h @@ -110,10 +110,10 @@ class ITK_TEMPLATE_EXPORT MissingStructurePenalty using typename Superclass1::DerivativeType; using typename Superclass1::ParametersType; - using CoordRepType = typename OutputPointType::CoordRepType; + using CoordinateType = typename OutputPointType::CoordinateType; using typename Superclass1::MeshIdType; - using CombinationTransformType = itk::AdvancedCombinationTransform; + using CombinationTransformType = itk::AdvancedCombinationTransform; using InitialTransformType = typename CombinationTransformType::InitialTransformType; /** Typedefs inherited from elastix. */ diff --git a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx index 24d637735..9b7d1770d 100644 --- a/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx +++ b/Components/Metrics/MissingStructurePenalty/elxMissingStructurePenalty.hxx @@ -405,7 +405,7 @@ the sequence of points to form a 2d connected polydata contour. using DummyIPPPixelType = unsigned char; using DummyMeshTraitsType = - itk::DefaultStaticMeshTraits; + itk::DefaultStaticMeshTraits; using DummyPointSetType = itk::PointSet; using DeformationVectorType = itk::Vector; diff --git a/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h b/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h index eeba504c8..86bb0ea29 100644 --- a/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h +++ b/Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h @@ -73,8 +73,8 @@ class ITK_TEMPLATE_EXPORT MissingVolumeMeshPenalty using typename Superclass::InputPointType; using typename Superclass::OutputPointType; - using CoordRepType = typename OutputPointType::CoordRepType; - using VnlVectorType = vnl_vector; + using CoordinateType = typename OutputPointType::CoordinateType; + using VnlVectorType = vnl_vector; using typename Superclass::NonZeroJacobianIndicesType; @@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT MissingVolumeMeshPenalty /** Typedefs. */ using DummyMeshPixelType = unsigned char; using MeshTraitsType = - DefaultStaticMeshTraits; + DefaultStaticMeshTraits; using FixedMeshType = Mesh; using FixedMeshPointIdentifier = typename FixedMeshType::PointIdentifier; diff --git a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h index 976021d8d..4aeb7273f 100644 --- a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h +++ b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.h @@ -120,16 +120,16 @@ class ITK_TEMPLATE_EXPORT PolydataDummyPenalty using typename Superclass1::DerivativeType; using typename Superclass1::ParametersType; - using CoordRepType = typename OutputPointType::CoordRepType; + using CoordinateType = typename OutputPointType::CoordinateType; using typename Superclass1::MeshIdType; /** Other typedef's. */ /*typedef itk::AdvancedTransform< - CoordRepType, + CoordinateType, itkGetStaticConstMacro( FixedImageDimension ), itkGetStaticConstMacro( MovingImageDimension ) > ITKBaseType; */ - using CombinationTransformType = itk::AdvancedCombinationTransform; + using CombinationTransformType = itk::AdvancedCombinationTransform; using InitialTransformType = typename CombinationTransformType::InitialTransformType; /** Typedefs inherited from elastix. */ diff --git a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx index fd683da20..e738988c2 100644 --- a/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx +++ b/Components/Metrics/PolydataDummyPenalty/elxPolydataDummyPenalty.hxx @@ -386,7 +386,7 @@ PolydataDummyPenalty::ReadTransformixPoints(const std::string & using DummyIPPPixelType = unsigned char; using DummyMeshTraitsType = - itk::DefaultStaticMeshTraits; + itk::DefaultStaticMeshTraits; using DummyPointSetType = itk::PointSet; using DeformationVectorType = itk::Vector; diff --git a/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h b/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h index 954e905f1..5dcc96de8 100644 --- a/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h +++ b/Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h @@ -69,8 +69,8 @@ class ITK_TEMPLATE_EXPORT MeshPenalty : public SingleValuedPointSetToPointSetMet /** Typedefs. */ using typename Superclass::InputPointType; using typename Superclass::OutputPointType; - using CoordRepType = typename InputPointType::CoordRepType; - using VnlVectorType = vnl_vector; + using CoordinateType = typename InputPointType::CoordinateType; + using VnlVectorType = vnl_vector; using FixedImagePointType = typename TransformType::InputPointType; using MovingImagePointType = typename TransformType::OutputPointType; using SpatialJacobianType = typename TransformType::SpatialJacobianType; @@ -83,7 +83,7 @@ class ITK_TEMPLATE_EXPORT MeshPenalty : public SingleValuedPointSetToPointSetMet using PointNormalType = Vector; using DummyMeshPixelType = unsigned char; using MeshTraitsType = - DefaultStaticMeshTraits; + DefaultStaticMeshTraits; using FixedMeshType = Mesh; using FixedMeshConstPointer = typename FixedMeshType::ConstPointer; diff --git a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h index d74f15927..454fa1fd8 100644 --- a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h +++ b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.h @@ -105,16 +105,16 @@ class ITK_TEMPLATE_EXPORT StatisticalShapePenalty using typename Superclass1::DerivativeType; using typename Superclass1::ParametersType; - using CoordRepType = typename OutputPointType::CoordRepType; - using VnlVectorType = vnl_vector; + using CoordinateType = typename OutputPointType::CoordinateType; + using VnlVectorType = vnl_vector; /** Other typedef's. */ /*typedef itk::AdvancedTransform< - CoordRepType, + CoordinateType, itkGetStaticConstMacro( FixedImageDimension ), itkGetStaticConstMacro( MovingImageDimension ) > ITKBaseType; */ - using CombinationTransformType = itk::AdvancedCombinationTransform; + using CombinationTransformType = itk::AdvancedCombinationTransform; using InitialTransformType = typename CombinationTransformType::InitialTransformType; /** Typedefs inherited from elastix. */ diff --git a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx index 6fdc3e15b..f54721aeb 100644 --- a/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx +++ b/Components/Metrics/StatisticalShapePenalty/elxStatisticalShapePenalty.hxx @@ -275,7 +275,7 @@ StatisticalShapePenalty::ReadShape(const std::string & Sh /** Typedef's. \todo test DummyIPPPixelType=bool. */ using DummyIPPPixelType = double; using MeshTraitsType = - DefaultStaticMeshTraits; + DefaultStaticMeshTraits; using MeshType = Mesh; /** Read the input points. */ diff --git a/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h b/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h index dba18e72c..dc4685a6f 100644 --- a/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h +++ b/Components/Metrics/StatisticalShapePenalty/itkStatisticalShapePointPenalty.h @@ -91,13 +91,13 @@ class ITK_TEMPLATE_EXPORT StatisticalShapePointPenalty using typename Superclass::InputPointType; using typename Superclass::OutputPointType; - using CoordRepType = typename OutputPointType::CoordRepType; - using VnlVectorType = vnl_vector; - using VnlMatrixType = vnl_matrix; + using CoordinateType = typename OutputPointType::CoordinateType; + using VnlVectorType = vnl_vector; + using VnlMatrixType = vnl_matrix; // typedef itk::Array ProposalDerivativeType; using ProposalDerivativeType = typename std::vector; // typedef typename vnl_vector ProposalDerivativeType; //Cannot be linked - using PCACovarianceType = vnl_svd_economy; + using PCACovarianceType = vnl_svd_economy; /** Initialization. */ void diff --git a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx index 0ab5ac369..bd9e58bb5 100644 --- a/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx +++ b/Components/Registrations/MultiMetricMultiResolutionRegistration/itkMultiMetricMultiResolutionImageRegistrationMethod.hxx @@ -257,7 +257,7 @@ MultiMetricMultiResolutionImageRegistrationMethod::Pr // Instead of copying the shrinking code, we compute image regions from // the result of the fixed image pyramid. using PointType = typename FixedImageType::PointType; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordinateType; PointType inputStartPoint; PointType inputEndPoint; @@ -276,9 +276,9 @@ MultiMetricMultiResolutionImageRegistrationMethod::Pr * downsampled version of 2 by 2. */ const auto startcindex = - fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputStartPoint); + fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputStartPoint); const auto endcindex = - fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputEndPoint); + fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputEndPoint); for (unsigned int dim = 0; dim < TFixedImage::ImageDimension; ++dim) { start[dim] = static_cast(std::ceil(startcindex[dim])); diff --git a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx index 1ad677c51..b51ac808a 100644 --- a/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx +++ b/Components/Registrations/MultiResolutionRegistrationWithFeatures/itkMultiInputMultiResolutionImageRegistrationMethodBase.hxx @@ -385,7 +385,7 @@ MultiInputMultiResolutionImageRegistrationMethodBase: // Instead of copying the shrinking code, we compute image regions from // the result of the fixed image pyramid. using PointType = typename FixedImageType::PointType; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordinateType; PointType inputStartPoint; PointType inputEndPoint; @@ -402,9 +402,9 @@ MultiInputMultiResolutionImageRegistrationMethodBase: * To be on the safe side, the start point is ceiled, and the end point is * floored. To see why, consider an image of 4 by 4, and its downsampled version of 2 by 2. */ const auto startcindex = - fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputStartPoint); + fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputStartPoint); const auto endcindex = - fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputEndPoint); + fixedImageAtLevel->template TransformPhysicalPointToContinuousIndex(inputEndPoint); for (unsigned int dim = 0; dim < TFixedImage::ImageDimension; ++dim) { start[dim] = static_cast(std::ceil(startcindex[dim])); diff --git a/Components/ResampleInterpolators/BSplineResampleInterpolator/elxBSplineResampleInterpolator.h b/Components/ResampleInterpolators/BSplineResampleInterpolator/elxBSplineResampleInterpolator.h index d84844128..20897a887 100644 --- a/Components/ResampleInterpolators/BSplineResampleInterpolator/elxBSplineResampleInterpolator.h +++ b/Components/ResampleInterpolators/BSplineResampleInterpolator/elxBSplineResampleInterpolator.h @@ -53,7 +53,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT BSplineResampleInterpolator : public itk::BSplineInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType, + typename ResampleInterpolatorBase::CoordinateType, double> , // CoefficientType public ResampleInterpolatorBase @@ -64,7 +64,7 @@ class ITK_TEMPLATE_EXPORT BSplineResampleInterpolator /** Standard ITK-stuff. */ using Self = BSplineResampleInterpolator; using Superclass1 = itk::BSplineInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType, + typename ResampleInterpolatorBase::CoordinateType, double>; using Superclass2 = ResampleInterpolatorBase; using Pointer = itk::SmartPointer; diff --git a/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/elxBSplineResampleInterpolatorFloat.h b/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/elxBSplineResampleInterpolatorFloat.h index 6aee896a4..f88ac3a74 100644 --- a/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/elxBSplineResampleInterpolatorFloat.h +++ b/Components/ResampleInterpolators/BSplineResampleInterpolatorFloat/elxBSplineResampleInterpolatorFloat.h @@ -53,7 +53,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT BSplineResampleInterpolatorFloat : public itk::BSplineInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType, + typename ResampleInterpolatorBase::CoordinateType, float> , // CoefficientType public ResampleInterpolatorBase @@ -64,7 +64,7 @@ class ITK_TEMPLATE_EXPORT BSplineResampleInterpolatorFloat /** Standard ITK-stuff. */ using Self = BSplineResampleInterpolatorFloat; using Superclass1 = itk::BSplineInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType, + typename ResampleInterpolatorBase::CoordinateType, float>; using Superclass2 = ResampleInterpolatorBase; using Pointer = itk::SmartPointer; diff --git a/Components/ResampleInterpolators/LinearResampleInterpolator/elxLinearResampleInterpolator.h b/Components/ResampleInterpolators/LinearResampleInterpolator/elxLinearResampleInterpolator.h index 2553002aa..c4c5361b3 100644 --- a/Components/ResampleInterpolators/LinearResampleInterpolator/elxLinearResampleInterpolator.h +++ b/Components/ResampleInterpolators/LinearResampleInterpolator/elxLinearResampleInterpolator.h @@ -43,7 +43,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT LinearResampleInterpolator : public itk::LinearInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType> + typename ResampleInterpolatorBase::CoordinateType> , public ResampleInterpolatorBase { public: @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT LinearResampleInterpolator /** Standard ITK-stuff. */ using Self = LinearResampleInterpolator; using Superclass1 = itk::LinearInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType>; + typename ResampleInterpolatorBase::CoordinateType>; using Superclass2 = ResampleInterpolatorBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; diff --git a/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/elxNearestNeighborResampleInterpolator.h b/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/elxNearestNeighborResampleInterpolator.h index 33560449c..35f933cd7 100644 --- a/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/elxNearestNeighborResampleInterpolator.h +++ b/Components/ResampleInterpolators/NearestNeighborResampleInterpolator/elxNearestNeighborResampleInterpolator.h @@ -43,7 +43,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT NearestNeighborResampleInterpolator : public itk::NearestNeighborInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType> + typename ResampleInterpolatorBase::CoordinateType> , public ResampleInterpolatorBase { public: @@ -53,7 +53,7 @@ class ITK_TEMPLATE_EXPORT NearestNeighborResampleInterpolator using Self = NearestNeighborResampleInterpolator; using Superclass1 = itk::NearestNeighborInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType>; + typename ResampleInterpolatorBase::CoordinateType>; using Superclass2 = ResampleInterpolatorBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; diff --git a/Components/ResampleInterpolators/RDBSplineResampleInterpolator/elxRDBSplineResampleInterpolator.h b/Components/ResampleInterpolators/RDBSplineResampleInterpolator/elxRDBSplineResampleInterpolator.h index 66999f746..18e89fe15 100644 --- a/Components/ResampleInterpolators/RDBSplineResampleInterpolator/elxRDBSplineResampleInterpolator.h +++ b/Components/ResampleInterpolators/RDBSplineResampleInterpolator/elxRDBSplineResampleInterpolator.h @@ -54,7 +54,7 @@ template class ITK_TEMPLATE_EXPORT ReducedDimensionBSplineResampleInterpolator : public itk::ReducedDimensionBSplineInterpolateImageFunction< typename ResampleInterpolatorBase::InputImageType, - typename ResampleInterpolatorBase::CoordRepType, + typename ResampleInterpolatorBase::CoordinateType, double> , // CoefficientType public ResampleInterpolatorBase @@ -66,7 +66,7 @@ class ITK_TEMPLATE_EXPORT ReducedDimensionBSplineResampleInterpolator using Self = ReducedDimensionBSplineResampleInterpolator; using Superclass1 = itk::ReducedDimensionBSplineInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType, + typename ResampleInterpolatorBase::CoordinateType, double>; using Superclass2 = ResampleInterpolatorBase; using Pointer = itk::SmartPointer; diff --git a/Components/ResampleInterpolators/RayCastResampleInterpolator/elxRayCastResampleInterpolator.h b/Components/ResampleInterpolators/RayCastResampleInterpolator/elxRayCastResampleInterpolator.h index 221aeeb3f..e56c2e5d7 100644 --- a/Components/ResampleInterpolators/RayCastResampleInterpolator/elxRayCastResampleInterpolator.h +++ b/Components/ResampleInterpolators/RayCastResampleInterpolator/elxRayCastResampleInterpolator.h @@ -37,7 +37,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT RayCastResampleInterpolator : public itk::AdvancedRayCastInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType> + typename ResampleInterpolatorBase::CoordinateType> , public ResampleInterpolatorBase { public: @@ -47,7 +47,7 @@ class ITK_TEMPLATE_EXPORT RayCastResampleInterpolator using Self = RayCastResampleInterpolator; using Superclass1 = itk::AdvancedRayCastInterpolateImageFunction::InputImageType, - typename ResampleInterpolatorBase::CoordRepType>; + typename ResampleInterpolatorBase::CoordinateType>; using Superclass2 = ResampleInterpolatorBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; @@ -83,14 +83,15 @@ class ITK_TEMPLATE_EXPORT RayCastResampleInterpolator /** Typedef's for CombinationTransform */ using EulerTransformType = - typename itk::EulerTransform::CoordRepType, ImageDimension>; + typename itk::EulerTransform::CoordinateType, ImageDimension>; using TransformParametersType = typename EulerTransformType::ParametersType; using EulerTransformPointer = typename EulerTransformType::Pointer; using AdvancedTransformType = typename itk:: - AdvancedTransform::CoordRepType, Self::ImageDimension, Self::ImageDimension>; + AdvancedTransform::CoordinateType, Self::ImageDimension, Self::ImageDimension>; using AdvancedTransformPointer = typename AdvancedTransformType::Pointer; using CombinationTransformType = - typename itk::AdvancedCombinationTransform::CoordRepType, Self::ImageDimension>; + typename itk::AdvancedCombinationTransform::CoordinateType, + Self::ImageDimension>; using CombinationTransformPointer = typename CombinationTransformType::Pointer; using typename Superclass2::ParameterMapType; diff --git a/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.h b/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.h index 7c32de8ea..f40eb2193 100644 --- a/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.h +++ b/Components/Resamplers/OpenCLResampler/elxOpenCLResampler.h @@ -50,7 +50,7 @@ template class OpenCLResampler : public itk::ResampleImageFilter::InputImageType, typename ResamplerBase::OutputImageType, - typename ResamplerBase::CoordRepType> + typename ResamplerBase::CoordinateType> , public ResamplerBase { public: @@ -61,7 +61,7 @@ class OpenCLResampler using Superclass1 = itk::ResampleImageFilter::InputImageType, typename ResamplerBase::OutputImageType, - typename ResamplerBase::CoordRepType>; + typename ResamplerBase::CoordinateType>; using Superclass2 = ResamplerBase; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; @@ -132,7 +132,7 @@ class OpenCLResampler GenerateData() override; /** Transform copier */ - using InterpolatorPrecisionType = typename ResamplerBase::CoordRepType; + using InterpolatorPrecisionType = typename ResamplerBase::CoordinateType; using AdvancedCombinationTransformType = typename itk::AdvancedCombinationTransform; using TransformCopierType = typename itk::GPUAdvancedCombinationTransformCopier; + itk::InterpolateImageFunction; using InterpolateCopierType = typename itk::GPUInterpolatorCopier; using InterpolateCopierPointer = typename InterpolateCopierType::Pointer; diff --git a/Components/Transforms/AdvancedAffineTransform/elxAdvancedAffineTransform.h b/Components/Transforms/AdvancedAffineTransform/elxAdvancedAffineTransform.h index 15209a9c3..cea5ab2c3 100644 --- a/Components/Transforms/AdvancedAffineTransform/elxAdvancedAffineTransform.h +++ b/Components/Transforms/AdvancedAffineTransform/elxAdvancedAffineTransform.h @@ -75,7 +75,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT AdvancedAffineTransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -84,7 +84,7 @@ class ITK_TEMPLATE_EXPORT AdvancedAffineTransformElastix /** Standard ITK-stuff. */ using Self = AdvancedAffineTransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -93,7 +93,7 @@ class ITK_TEMPLATE_EXPORT AdvancedAffineTransformElastix /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ using AffineTransformType = - itk::AdvancedMatrixOffsetTransformBase::CoordRepType, + itk::AdvancedMatrixOffsetTransformBase::CoordinateType, elx::TransformBase::FixedImageDimension, elx::TransformBase::MovingImageDimension>; @@ -130,7 +130,7 @@ class ITK_TEMPLATE_EXPORT AdvancedAffineTransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/AdvancedAffineTransform/itkCenteredTransformInitializer2.hxx b/Components/Transforms/AdvancedAffineTransform/itkCenteredTransformInitializer2.hxx index adeeb843f..bbb409866 100644 --- a/Components/Transforms/AdvancedAffineTransform/itkCenteredTransformInitializer2.hxx +++ b/Components/Transforms/AdvancedAffineTransform/itkCenteredTransformInitializer2.hxx @@ -144,8 +144,8 @@ CenteredTransformInitializer2::Initialize const typename MovingImageType::IndexType & movingIndex = movingRegion.GetIndex(); const typename MovingImageType::SizeType & movingSize = movingRegion.GetSize(); - using CoordRepType = typename InputPointType::ValueType; - using ContinuousIndexType = ContinuousIndex; + using CoordinateType = typename InputPointType::ValueType; + using ContinuousIndexType = ContinuousIndex; using ContinuousIndexValueType = typename ContinuousIndexType::ValueType; diff --git a/Components/Transforms/AdvancedBSplineTransform/elxAdvancedBSplineTransform.h b/Components/Transforms/AdvancedBSplineTransform/elxAdvancedBSplineTransform.h index f4a181279..ee263df20 100644 --- a/Components/Transforms/AdvancedBSplineTransform/elxAdvancedBSplineTransform.h +++ b/Components/Transforms/AdvancedBSplineTransform/elxAdvancedBSplineTransform.h @@ -108,7 +108,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT AdvancedBSplineTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public TransformBase { @@ -117,7 +117,7 @@ class ITK_TEMPLATE_EXPORT AdvancedBSplineTransform /** Standard ITK-stuff. */ using Self = AdvancedBSplineTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -142,7 +142,7 @@ class ITK_TEMPLATE_EXPORT AdvancedBSplineTransform * that is set as the "CurrentTransform" in the CombinationTransform. */ using BSplineTransformBaseType = - itk::AdvancedBSplineDeformableTransformBase::CoordRepType, + itk::AdvancedBSplineDeformableTransformBase::CoordinateType, Self::SpaceDimension>; using BSplineTransformBasePointer = typename BSplineTransformBaseType::Pointer; @@ -176,15 +176,15 @@ class ITK_TEMPLATE_EXPORT AdvancedBSplineTransform /** Typedef's from TransformBase. */ using typename Superclass2::ElastixType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; using CombinationTransformType = typename Superclass2::CombinationTransformType; /** Typedef's for the GridScheduleComputer and the UpsampleBSplineParametersFilter. */ - using GridScheduleComputerType = itk::GridScheduleComputer; - using CyclicGridScheduleComputerType = itk::CyclicGridScheduleComputer; + using GridScheduleComputerType = itk::GridScheduleComputer; + using CyclicGridScheduleComputerType = itk::CyclicGridScheduleComputer; using GridScheduleComputerPointer = typename GridScheduleComputerType::Pointer; using GridScheduleType = typename GridScheduleComputerType ::VectorGridSpacingFactorType; using GridUpsamplerType = itk::UpsampleBSplineParametersFilter; diff --git a/Components/Transforms/AffineDTITransform/elxAffineDTITransform.h b/Components/Transforms/AffineDTITransform/elxAffineDTITransform.h index e7e54edbe..3a3a30690 100644 --- a/Components/Transforms/AffineDTITransform/elxAffineDTITransform.h +++ b/Components/Transforms/AffineDTITransform/elxAffineDTITransform.h @@ -76,7 +76,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT AffineDTITransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT AffineDTITransformElastix /** Standard ITK-stuff.*/ using Self = AffineDTITransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -93,7 +93,7 @@ class ITK_TEMPLATE_EXPORT AffineDTITransformElastix /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ - using AffineDTITransformType = itk::AffineDTITransform::CoordRepType, + using AffineDTITransformType = itk::AffineDTITransform::CoordinateType, elx::TransformBase::FixedImageDimension>; /** Method for creation through the object factory. */ @@ -135,7 +135,7 @@ class ITK_TEMPLATE_EXPORT AffineDTITransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/AffineLogStackTransform/elxAffineLogStackTransform.h b/Components/Transforms/AffineLogStackTransform/elxAffineLogStackTransform.h index f0347b708..942b29088 100644 --- a/Components/Transforms/AffineLogStackTransform/elxAffineLogStackTransform.h +++ b/Components/Transforms/AffineLogStackTransform/elxAffineLogStackTransform.h @@ -39,7 +39,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT AffineLogStackTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -48,7 +48,7 @@ class ITK_TEMPLATE_EXPORT AffineLogStackTransform /** Standard ITK-stuff. */ using Self = AffineLogStackTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -71,13 +71,13 @@ class ITK_TEMPLATE_EXPORT AffineLogStackTransform itkStaticConstMacro(ReducedSpaceDimension, unsigned int, Superclass2::FixedImageDimension - 1); using AffineLogTransformType = - itk::AffineLogTransform::CoordRepType, Self::SpaceDimension>; + itk::AffineLogTransform::CoordinateType, Self::SpaceDimension>; using AffineLogTransformPointer = typename AffineLogTransformType::Pointer; using InputPointType = typename AffineLogTransformType::InputPointType; /** The ITK-class for the sub transforms, which have a reduced dimension. */ using ReducedDimensionAffineLogTransformBaseType = - itk::AffineLogTransform::CoordRepType, Self::ReducedSpaceDimension>; + itk::AffineLogTransform::CoordinateType, Self::ReducedSpaceDimension>; using ReducedDimensionAffineLogTransformBasePointer = typename ReducedDimensionAffineLogTransformBaseType::Pointer; using ReducedDimensionOutputVectorType = typename ReducedDimensionAffineLogTransformBaseType::OutputVectorType; @@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT AffineLogStackTransform using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; @@ -118,8 +118,8 @@ class ITK_TEMPLATE_EXPORT AffineLogStackTransform using SpacingType = typename FixedImageType::SpacingType; using RegionType = typename FixedImageType::RegionType; using DirectionType = typename FixedImageType::DirectionType; - using ReducedDimensionContinuousIndexType = typename itk::ContinuousIndex; - using ContinuousIndexType = typename itk::ContinuousIndex; + using ReducedDimensionContinuousIndexType = typename itk::ContinuousIndex; + using ContinuousIndexType = typename itk::ContinuousIndex; /** Execute stuff before anything else is done:*/ diff --git a/Components/Transforms/AffineLogStackTransform/itkAffineLogStackTransform.h b/Components/Transforms/AffineLogStackTransform/itkAffineLogStackTransform.h index 96d251492..78b1a8cd3 100644 --- a/Components/Transforms/AffineLogStackTransform/itkAffineLogStackTransform.h +++ b/Components/Transforms/AffineLogStackTransform/itkAffineLogStackTransform.h @@ -26,16 +26,16 @@ namespace itk { template class ITK_TEMPLATE_EXPORT AffineLogStackTransform - : public itk::StackTransform + : public itk::StackTransform { private: - using CoordRepType = elx::ElastixBase::CoordRepType; + using CoordinateType = elx::ElastixBase::CoordinateType; public: ITK_DISALLOW_COPY_AND_MOVE(AffineLogStackTransform); using Self = AffineLogStackTransform; - using Superclass = itk::StackTransform; + using Superclass = itk::StackTransform; using Pointer = itk::SmartPointer; itkNewMacro(Self); itkOverrideGetNameOfClassMacro(AffineLogStackTransform); @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT AffineLogStackTransform typename Superclass::SubTransformPointer CreateSubTransform() const override { - return AffineLogTransform::New().GetPointer(); + return AffineLogTransform::New().GetPointer(); } }; diff --git a/Components/Transforms/AffineLogTransform/elxAffineLogTransform.h b/Components/Transforms/AffineLogTransform/elxAffineLogTransform.h index bc25928db..f885c8f5c 100644 --- a/Components/Transforms/AffineLogTransform/elxAffineLogTransform.h +++ b/Components/Transforms/AffineLogTransform/elxAffineLogTransform.h @@ -41,7 +41,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT AffineLogTransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -50,7 +50,7 @@ class ITK_TEMPLATE_EXPORT AffineLogTransformElastix /** Standard ITK-stuff.*/ using Self = AffineLogTransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -58,7 +58,7 @@ class ITK_TEMPLATE_EXPORT AffineLogTransformElastix /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ - using AffineLogTransformType = itk::AffineLogTransform::CoordRepType, + using AffineLogTransformType = itk::AffineLogTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; /** Method for creation through the object factory. */ @@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT AffineLogTransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.h b/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.h index 0591b9f94..e7462dccb 100644 --- a/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.h +++ b/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.h @@ -159,7 +159,7 @@ template class ITK_TEMPLATE_EXPORT BSplineTransformWithDiffusion : public itk::DeformationFieldRegulizer::CoordRepType, + typename elx::TransformBase::CoordinateType, elx::TransformBase::FixedImageDimension>> , // elx::TransformBase::FixedImageDimension, __VSplineOrder > >, @@ -171,7 +171,7 @@ class ITK_TEMPLATE_EXPORT BSplineTransformWithDiffusion /** Standard ITK-stuff. */ using Self = BSplineTransformWithDiffusion; using Superclass1 = itk::DeformationFieldRegulizer< - itk::AdvancedCombinationTransform::CoordRepType, + itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>>; using Superclass2 = elx::TransformBase; @@ -179,7 +179,7 @@ class ITK_TEMPLATE_EXPORT BSplineTransformWithDiffusion * that is set as the "CurrentTransform" in the CombinationTransform. */ using BSplineTransformType = - itk::AdvancedBSplineDeformableTransform::CoordRepType, + itk::AdvancedBSplineDeformableTransform::CoordinateType, elx::TransformBase::FixedImageDimension, 3>; @@ -235,7 +235,7 @@ class ITK_TEMPLATE_EXPORT BSplineTransformWithDiffusion using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; @@ -268,9 +268,9 @@ class ITK_TEMPLATE_EXPORT BSplineTransformWithDiffusion using DiffusionFilterType = itk::VectorMeanDiffusionImageFilter; using DiffusionFilterPointer = typename DiffusionFilterType::Pointer; using RadiusType = typename VectorImageType::SizeType; - using ResamplerType1 = itk::ResampleImageFilter; + using ResamplerType1 = itk::ResampleImageFilter; using ResamplerPointer1 = typename ResamplerType1::Pointer; - using ResamplerType2 = itk::ResampleImageFilter; + using ResamplerType2 = itk::ResampleImageFilter; using ResamplerPointer2 = typename ResamplerType2::Pointer; using InterpolatorType = itk::BSplineInterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; diff --git a/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx b/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx index 452cf83d1..6a3e2c0eb 100644 --- a/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx +++ b/Components/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx @@ -681,8 +681,8 @@ BSplineTransformWithDiffusion::IncreaseScale() { /** Typedefs. */ using UpsampleFilterType = itk::ResampleImageFilter; - using IdentityTransformType = itk::IdentityTransform; - using CoefficientUpsampleFunctionType = itk::BSplineResampleImageFunction; + using IdentityTransformType = itk::IdentityTransform; + using CoefficientUpsampleFunctionType = itk::BSplineResampleImageFunction; using DecompositionFilterType = itk::BSplineDecompositionImageFilter; /** The current region/spacing settings of the grid. */ diff --git a/Components/Transforms/BSplineStackTransform/elxBSplineStackTransform.h b/Components/Transforms/BSplineStackTransform/elxBSplineStackTransform.h index a4ce97b85..fedc507f4 100644 --- a/Components/Transforms/BSplineStackTransform/elxBSplineStackTransform.h +++ b/Components/Transforms/BSplineStackTransform/elxBSplineStackTransform.h @@ -111,7 +111,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT BSplineStackTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public TransformBase { @@ -120,7 +120,7 @@ class ITK_TEMPLATE_EXPORT BSplineStackTransform /** Standard ITK-stuff. */ using Self = BSplineStackTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -146,13 +146,13 @@ class ITK_TEMPLATE_EXPORT BSplineStackTransform * that is set as the "CurrentTransform" in the CombinationTransform. */ using BSplineTransformBaseType = - itk::AdvancedBSplineDeformableTransformBase::CoordRepType, + itk::AdvancedBSplineDeformableTransformBase::CoordinateType, Self::SpaceDimension>; using BSplineTransformBasePointer = typename BSplineTransformBaseType::Pointer; /** The ITK-class for the sub transforms, which have a reduced dimension. */ using ReducedDimensionBSplineTransformBaseType = - itk::AdvancedBSplineDeformableTransformBase::CoordRepType, + itk::AdvancedBSplineDeformableTransformBase::CoordinateType, Self::ReducedSpaceDimension>; using ReducedDimensionBSplineTransformBasePointer = typename ReducedDimensionBSplineTransformBaseType::Pointer; @@ -175,7 +175,7 @@ class ITK_TEMPLATE_EXPORT BSplineStackTransform /** Typedef's from TransformBase. */ using typename Superclass2::ElastixType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; @@ -191,7 +191,7 @@ class ITK_TEMPLATE_EXPORT BSplineStackTransform using ReducedDimensionOriginType = typename ReducedDimensionImageType::PointType; /** Typedef's for the GridScheduleComputer and the UpsampleBSplineParametersFilter. */ - using GridScheduleComputerType = itk::GridScheduleComputer; + using GridScheduleComputerType = itk::GridScheduleComputer; using GridScheduleComputerPointer = typename GridScheduleComputerType::Pointer; using GridScheduleType = typename GridScheduleComputerType ::VectorGridSpacingFactorType; using GridUpsamplerType = itk::UpsampleBSplineParametersFilter; diff --git a/Components/Transforms/BSplineStackTransform/itkBSplineStackTransform.h b/Components/Transforms/BSplineStackTransform/itkBSplineStackTransform.h index 1f3230a3a..042c33226 100644 --- a/Components/Transforms/BSplineStackTransform/itkBSplineStackTransform.h +++ b/Components/Transforms/BSplineStackTransform/itkBSplineStackTransform.h @@ -26,16 +26,16 @@ namespace itk { template class ITK_TEMPLATE_EXPORT BSplineStackTransform - : public itk::StackTransform + : public itk::StackTransform { private: - using CoordRepType = elx::ElastixBase::CoordRepType; + using CoordinateType = elx::ElastixBase::CoordinateType; public: ITK_DISALLOW_COPY_AND_MOVE(BSplineStackTransform); using Self = BSplineStackTransform; - using Superclass = itk::StackTransform; + using Superclass = itk::StackTransform; using Pointer = itk::SmartPointer; using typename Superclass::FixedParametersType; itkNewMacro(Self); @@ -45,7 +45,7 @@ class ITK_TEMPLATE_EXPORT BSplineStackTransform using Superclass::NumberOfGeneralFixedParametersOfStack; static constexpr unsigned int NumberOfFixedParametersOfSubTransform = - AdvancedBSplineDeformableTransformBase::NumberOfFixedParameters; + AdvancedBSplineDeformableTransformBase::NumberOfFixedParameters; static constexpr unsigned int NumberOfFixedParameters = NumberOfGeneralFixedParametersOfStack + NumberOfFixedParametersOfSubTransform + 1; @@ -114,7 +114,7 @@ class ITK_TEMPLATE_EXPORT BSplineStackTransform typename Superclass::SubTransformPointer CreateSubTransform() const override { - return AdvancedBSplineDeformableTransformBase::template Create< + return AdvancedBSplineDeformableTransformBase::template Create< AdvancedBSplineDeformableTransform>(m_SplineOrder); } diff --git a/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.h b/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.h index ec14e6cb5..7fa1227a8 100644 --- a/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.h +++ b/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.h @@ -52,7 +52,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT DeformationFieldTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public TransformBase { @@ -65,11 +65,11 @@ class ITK_TEMPLATE_EXPORT DeformationFieldTransform /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ using DeformationFieldInterpolatingTransformType = - itk::DeformationFieldInterpolatingTransform::CoordRepType, + itk::DeformationFieldInterpolatingTransform::CoordinateType, elx::TransformBase::FixedImageDimension, float>; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; @@ -116,7 +116,7 @@ class ITK_TEMPLATE_EXPORT DeformationFieldTransform using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.hxx b/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.hxx index 237bf5d51..a7a43dbdb 100644 --- a/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.hxx +++ b/Components/Transforms/DeformationFieldTransform/elxDeformationFieldTransform.hxx @@ -104,8 +104,8 @@ DeformationFieldTransform::ReadFromFile() this->m_DeformationFieldInterpolatingTransform->SetDeformationField(infoChanger->GetOutput()); using InterpolatorType = typename DeformationFieldInterpolatingTransformType::DeformationFieldInterpolatorType; - using NNInterpolatorType = itk::VectorNearestNeighborInterpolateImageFunction; - using LinInterpolatorType = itk::VectorLinearInterpolateImageFunction; + using NNInterpolatorType = itk::VectorNearestNeighborInterpolateImageFunction; + using LinInterpolatorType = itk::VectorLinearInterpolateImageFunction; typename InterpolatorType::Pointer interpolator; // default-constructed (null) unsigned int interpolationOrder = 0; diff --git a/Components/Transforms/EulerStackTransform/elxEulerStackTransform.h b/Components/Transforms/EulerStackTransform/elxEulerStackTransform.h index ffb637c65..455c5478d 100644 --- a/Components/Transforms/EulerStackTransform/elxEulerStackTransform.h +++ b/Components/Transforms/EulerStackTransform/elxEulerStackTransform.h @@ -82,7 +82,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT EulerStackTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT EulerStackTransform /** Standard ITK-stuff. */ using Self = EulerStackTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -117,13 +117,13 @@ class ITK_TEMPLATE_EXPORT EulerStackTransform * that is set as the "CurrentTransform" in the CombinationTransform. */ using EulerTransformType = - itk::EulerTransform::CoordRepType, Self::SpaceDimension>; + itk::EulerTransform::CoordinateType, Self::SpaceDimension>; using EulerTransformPointer = typename EulerTransformType::Pointer; using InputPointType = typename EulerTransformType::InputPointType; /** The ITK-class for the sub transforms, which have a reduced dimension. */ using ReducedDimensionEulerTransformType = - itk::EulerTransform::CoordRepType, Self::ReducedSpaceDimension>; + itk::EulerTransform::CoordinateType, Self::ReducedSpaceDimension>; using ReducedDimensionEulerTransformPointer = typename ReducedDimensionEulerTransformType::Pointer; using ReducedDimensionOutputVectorType = typename ReducedDimensionEulerTransformType::OutputVectorType; @@ -137,7 +137,7 @@ class ITK_TEMPLATE_EXPORT EulerStackTransform using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; @@ -164,8 +164,8 @@ class ITK_TEMPLATE_EXPORT EulerStackTransform using SpacingType = typename FixedImageType::SpacingType; using RegionType = typename FixedImageType::RegionType; using DirectionType = typename FixedImageType::DirectionType; - using ReducedDimensionContinuousIndexType = typename itk::ContinuousIndex; - using ContinuousIndexType = typename itk::ContinuousIndex; + using ReducedDimensionContinuousIndexType = typename itk::ContinuousIndex; + using ContinuousIndexType = typename itk::ContinuousIndex; /** Execute stuff before anything else is done:*/ diff --git a/Components/Transforms/EulerStackTransform/elxEulerStackTransform.hxx b/Components/Transforms/EulerStackTransform/elxEulerStackTransform.hxx index 0601c44fb..904c1faa4 100644 --- a/Components/Transforms/EulerStackTransform/elxEulerStackTransform.hxx +++ b/Components/Transforms/EulerStackTransform/elxEulerStackTransform.hxx @@ -306,7 +306,7 @@ EulerStackTransform::InitialTransformCenter(ReducedDimensionInputPoint auto fullDimensionCenterIndex = this->m_Registration->GetAsITKBaseType() ->GetFixedImage() - ->template TransformPhysicalPointToContinuousIndex(fullDimensionCenterPoint); + ->template TransformPhysicalPointToContinuousIndex(fullDimensionCenterPoint); /** Get size of image and number of time points. */ const SizeType fixedImageSize = diff --git a/Components/Transforms/EulerStackTransform/itkEulerStackTransform.h b/Components/Transforms/EulerStackTransform/itkEulerStackTransform.h index 633421ed9..561e97b4b 100644 --- a/Components/Transforms/EulerStackTransform/itkEulerStackTransform.h +++ b/Components/Transforms/EulerStackTransform/itkEulerStackTransform.h @@ -26,16 +26,16 @@ namespace itk { template class ITK_TEMPLATE_EXPORT EulerStackTransform - : public itk::StackTransform + : public itk::StackTransform { private: - using CoordRepType = elx::ElastixBase::CoordRepType; + using CoordinateType = elx::ElastixBase::CoordinateType; public: ITK_DISALLOW_COPY_AND_MOVE(EulerStackTransform); using Self = EulerStackTransform; - using Superclass = itk::StackTransform; + using Superclass = itk::StackTransform; using Pointer = itk::SmartPointer; itkNewMacro(Self); itkOverrideGetNameOfClassMacro(EulerStackTransform); @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT EulerStackTransform typename Superclass::SubTransformPointer CreateSubTransform() const override { - return EulerTransform::New().GetPointer(); + return EulerTransform::New().GetPointer(); } }; diff --git a/Components/Transforms/EulerTransform/elxEulerTransform.h b/Components/Transforms/EulerTransform/elxEulerTransform.h index d1d245262..0d928e868 100644 --- a/Components/Transforms/EulerTransform/elxEulerTransform.h +++ b/Components/Transforms/EulerTransform/elxEulerTransform.h @@ -74,7 +74,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT EulerTransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -84,14 +84,14 @@ class ITK_TEMPLATE_EXPORT EulerTransformElastix /** Standard ITK-stuff.*/ using Self = EulerTransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ - using EulerTransformType = itk::EulerTransform::CoordRepType, + using EulerTransformType = itk::EulerTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Pointer = itk::SmartPointer; @@ -137,7 +137,7 @@ class ITK_TEMPLATE_EXPORT EulerTransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/ExternalTransform/elxExternalTransform.h b/Components/Transforms/ExternalTransform/elxExternalTransform.h index 8531e4009..36a1f34b6 100644 --- a/Components/Transforms/ExternalTransform/elxExternalTransform.h +++ b/Components/Transforms/ExternalTransform/elxExternalTransform.h @@ -46,7 +46,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT ExternalTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public TransformBase { @@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT ExternalTransform using Self = ExternalTransform; /** The ITK-class that provides most of the functionality */ - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; @@ -67,7 +67,7 @@ class ITK_TEMPLATE_EXPORT ExternalTransform /** Typedef's from TransformBase. */ using typename Superclass2::ParameterMapType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -102,7 +102,7 @@ class ITK_TEMPLATE_EXPORT ExternalTransform ParameterMapType CreateDerivedTransformParameterMap() const override; - using AdvancedTransformAdapterType = AdvancedTransformAdapter; + using AdvancedTransformAdapterType = AdvancedTransformAdapter; /** The transform that is set as current transform in the CombinationTransform */ const itk::SmartPointer m_AdvancedTransformAdapter{ diff --git a/Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.h b/Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.h index 62cc523be..19504cad6 100644 --- a/Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.h +++ b/Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.h @@ -89,7 +89,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT MultiBSplineTransformWithNormal - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public TransformBase { @@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT MultiBSplineTransformWithNormal /** Standard ITK-stuff. */ using Self = MultiBSplineTransformWithNormal; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -123,21 +123,21 @@ class ITK_TEMPLATE_EXPORT MultiBSplineTransformWithNormal * that is set as the "CurrentTransform" in the CombinationTransform. */ using BSplineTransformBaseType = - itk::AdvancedBSplineDeformableTransformBase::CoordRepType, + itk::AdvancedBSplineDeformableTransformBase::CoordinateType, Self::SpaceDimension>; using BSplineTransformBasePointer = typename BSplineTransformBaseType::Pointer; /** Typedef for supported BSplineTransform types. */ using MultiBSplineTransformWithNormalLinearType = - itk::MultiBSplineDeformableTransformWithNormal::CoordRepType, + itk::MultiBSplineDeformableTransformWithNormal::CoordinateType, Self::SpaceDimension, 1>; using MultiBSplineTransformWithNormalQuadraticType = - itk::MultiBSplineDeformableTransformWithNormal::CoordRepType, + itk::MultiBSplineDeformableTransformWithNormal::CoordinateType, Self::SpaceDimension, 2>; using MultiBSplineTransformWithNormalCubicType = - itk::MultiBSplineDeformableTransformWithNormal::CoordRepType, + itk::MultiBSplineDeformableTransformWithNormal::CoordinateType, Self::SpaceDimension, 3>; @@ -172,14 +172,14 @@ class ITK_TEMPLATE_EXPORT MultiBSplineTransformWithNormal using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; using CombinationTransformType = typename Superclass2::CombinationTransformType; /** Typedef's for the GridScheduleComputer and the UpsampleBSplineParametersFilter. */ - using GridScheduleComputerType = itk::GridScheduleComputer; + using GridScheduleComputerType = itk::GridScheduleComputer; using GridScheduleComputerPointer = typename GridScheduleComputerType::Pointer; using GridScheduleType = typename GridScheduleComputerType ::VectorGridSpacingFactorType; using GridUpsamplerType = itk::UpsampleBSplineParametersFilter; diff --git a/Components/Transforms/RecursiveBSplineTransform/elxRecursiveBSplineTransform.h b/Components/Transforms/RecursiveBSplineTransform/elxRecursiveBSplineTransform.h index ccc440faa..158f949e1 100644 --- a/Components/Transforms/RecursiveBSplineTransform/elxRecursiveBSplineTransform.h +++ b/Components/Transforms/RecursiveBSplineTransform/elxRecursiveBSplineTransform.h @@ -108,7 +108,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT RecursiveBSplineTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public TransformBase { @@ -117,7 +117,7 @@ class ITK_TEMPLATE_EXPORT RecursiveBSplineTransform /** Standard ITK-stuff. */ using Self = RecursiveBSplineTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -142,7 +142,7 @@ class ITK_TEMPLATE_EXPORT RecursiveBSplineTransform * that is set as the "CurrentTransform" in the CombinationTransform. */ using BSplineTransformBaseType = - itk::AdvancedBSplineDeformableTransformBase::CoordRepType, + itk::AdvancedBSplineDeformableTransformBase::CoordinateType, Self::SpaceDimension>; using BSplineTransformBasePointer = typename BSplineTransformBaseType::Pointer; @@ -176,15 +176,15 @@ class ITK_TEMPLATE_EXPORT RecursiveBSplineTransform /** Typedef's from TransformBase. */ using typename Superclass2::ElastixType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; using CombinationTransformType = typename Superclass2::CombinationTransformType; /** Typedef's for the GridScheduleComputer and the UpsampleBSplineParametersFilter. */ - using GridScheduleComputerType = itk::GridScheduleComputer; - using CyclicGridScheduleComputerType = itk::CyclicGridScheduleComputer; + using GridScheduleComputerType = itk::GridScheduleComputer; + using CyclicGridScheduleComputerType = itk::CyclicGridScheduleComputer; using GridScheduleComputerPointer = typename GridScheduleComputerType::Pointer; using GridScheduleType = typename GridScheduleComputerType ::VectorGridSpacingFactorType; using GridUpsamplerType = itk::UpsampleBSplineParametersFilter; diff --git a/Components/Transforms/SimilarityTransform/elxSimilarityTransform.h b/Components/Transforms/SimilarityTransform/elxSimilarityTransform.h index e8a2ec0a1..7a9670cad 100644 --- a/Components/Transforms/SimilarityTransform/elxSimilarityTransform.h +++ b/Components/Transforms/SimilarityTransform/elxSimilarityTransform.h @@ -77,7 +77,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT SimilarityTransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -86,7 +86,7 @@ class ITK_TEMPLATE_EXPORT SimilarityTransformElastix /** Standard ITK-stuff. */ using Self = SimilarityTransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -94,7 +94,7 @@ class ITK_TEMPLATE_EXPORT SimilarityTransformElastix /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ - using SimilarityTransformType = itk::SimilarityTransform::CoordRepType, + using SimilarityTransformType = itk::SimilarityTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; /** Method for creation through the object factory. */ @@ -137,7 +137,7 @@ class ITK_TEMPLATE_EXPORT SimilarityTransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.h b/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.h index 5e25a3902..8a67adc7f 100644 --- a/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.h +++ b/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.h @@ -113,7 +113,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT SplineKernelTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -122,14 +122,14 @@ class ITK_TEMPLATE_EXPORT SplineKernelTransform /** Standard ITK-stuff. */ using Self = SplineKernelTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform. */ - using KernelTransformType = itk::KernelTransform2::CoordRepType, + using KernelTransformType = itk::KernelTransform2::CoordinateType, elx::TransformBase::FixedImageDimension>; using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; @@ -167,7 +167,7 @@ class ITK_TEMPLATE_EXPORT SplineKernelTransform using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; @@ -204,11 +204,11 @@ class ITK_TEMPLATE_EXPORT SplineKernelTransform /** The destructor. */ ~SplineKernelTransform() override = default; - using TPKernelTransformType = itk::ThinPlateSplineKernelTransform2; - using TPRKernelTransformType = itk::ThinPlateR2LogRSplineKernelTransform2; - using VKernelTransformType = itk::VolumeSplineKernelTransform2; - using EBKernelTransformType = itk::ElasticBodySplineKernelTransform2; - using EBRKernelTransformType = itk::ElasticBodyReciprocalSplineKernelTransform2; + using TPKernelTransformType = itk::ThinPlateSplineKernelTransform2; + using TPRKernelTransformType = itk::ThinPlateR2LogRSplineKernelTransform2; + using VKernelTransformType = itk::VolumeSplineKernelTransform2; + using EBKernelTransformType = itk::ElasticBodySplineKernelTransform2; + using EBRKernelTransformType = itk::ElasticBodyReciprocalSplineKernelTransform2; /** Create an instance of a kernel transform. Returns false if the * kernelType is unknown. diff --git a/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.hxx b/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.hxx index 97349df05..016c9885b 100644 --- a/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.hxx +++ b/Components/Transforms/SplineKernelTransform/elxSplineKernelTransform.hxx @@ -418,8 +418,8 @@ SplineKernelTransform::ReadFromFile() configuration.ReadParameter(numberOfParameters, "NumberOfParameters", 0); /** Read source landmarks. */ - std::vector fixedImageLandmarks(numberOfParameters, CoordRepType{}); - bool retfil = + std::vector fixedImageLandmarks(numberOfParameters, CoordinateType{}); + bool retfil = configuration.ReadParameter(fixedImageLandmarks, "FixedImageLandmarks", 0, numberOfParameters - 1, true); if (!retfil) { diff --git a/Components/Transforms/TranslationStackTransform/elxTranslationStackTransform.h b/Components/Transforms/TranslationStackTransform/elxTranslationStackTransform.h index 4ec6821e9..d10d8fcda 100644 --- a/Components/Transforms/TranslationStackTransform/elxTranslationStackTransform.h +++ b/Components/Transforms/TranslationStackTransform/elxTranslationStackTransform.h @@ -55,7 +55,7 @@ namespace elastix { template class ITK_TEMPLATE_EXPORT TranslationStackTransform - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -64,7 +64,7 @@ class ITK_TEMPLATE_EXPORT TranslationStackTransform /** Standard ITK-stuff. */ using Self = TranslationStackTransform; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; using Pointer = itk::SmartPointer; @@ -90,12 +90,13 @@ class ITK_TEMPLATE_EXPORT TranslationStackTransform * that is set as the "CurrentTransform" in the CombinationTransform. */ using TranslationTransformType = - itk::AdvancedTranslationTransform::CoordRepType, Self::SpaceDimension>; + itk::AdvancedTranslationTransform::CoordinateType, Self::SpaceDimension>; using TranslationTransformPointer = typename TranslationTransformType::Pointer; /** The ITK-class for the sub transforms, which have a reduced dimension. */ using ReducedDimensionTranslationTransformType = - itk::AdvancedTranslationTransform::CoordRepType, Self::ReducedSpaceDimension>; + itk::AdvancedTranslationTransform::CoordinateType, + Self::ReducedSpaceDimension>; using ReducedDimensionTranslationTransformPointer = typename ReducedDimensionTranslationTransformType::Pointer; /** Typedefs inherited from the superclass. */ @@ -106,7 +107,7 @@ class ITK_TEMPLATE_EXPORT TranslationStackTransform using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/TranslationStackTransform/itkTranslationStackTransform.h b/Components/Transforms/TranslationStackTransform/itkTranslationStackTransform.h index d1e488cad..73a9ff078 100644 --- a/Components/Transforms/TranslationStackTransform/itkTranslationStackTransform.h +++ b/Components/Transforms/TranslationStackTransform/itkTranslationStackTransform.h @@ -26,16 +26,16 @@ namespace itk { template class ITK_TEMPLATE_EXPORT TranslationStackTransform - : public itk::StackTransform + : public itk::StackTransform { private: - using CoordRepType = elx::ElastixBase::CoordRepType; + using CoordinateType = elx::ElastixBase::CoordinateType; public: ITK_DISALLOW_COPY_AND_MOVE(TranslationStackTransform); using Self = TranslationStackTransform; - using Superclass = itk::StackTransform; + using Superclass = itk::StackTransform; using Pointer = itk::SmartPointer; itkNewMacro(Self); itkOverrideGetNameOfClassMacro(TranslationStackTransform); @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT TranslationStackTransform typename Superclass::SubTransformPointer CreateSubTransform() const override { - return AdvancedTranslationTransform::New().GetPointer(); + return AdvancedTranslationTransform::New().GetPointer(); } }; diff --git a/Components/Transforms/TranslationTransform/elxTranslationTransform.h b/Components/Transforms/TranslationTransform/elxTranslationTransform.h index 816deb114..b32661e0c 100644 --- a/Components/Transforms/TranslationTransform/elxTranslationTransform.h +++ b/Components/Transforms/TranslationTransform/elxTranslationTransform.h @@ -48,7 +48,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT TranslationTransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -58,7 +58,7 @@ class ITK_TEMPLATE_EXPORT TranslationTransformElastix /** Standard ITK-stuff. */ using Self = TranslationTransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; @@ -66,7 +66,7 @@ class ITK_TEMPLATE_EXPORT TranslationTransformElastix /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ using TranslationTransformType = - itk::AdvancedTranslationTransform::CoordRepType, + itk::AdvancedTranslationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Pointer = itk::SmartPointer; @@ -105,7 +105,7 @@ class ITK_TEMPLATE_EXPORT TranslationTransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Components/Transforms/WeightedCombinationTransform/elxWeightedCombinationTransform.h b/Components/Transforms/WeightedCombinationTransform/elxWeightedCombinationTransform.h index ac1f93517..2331f00ed 100644 --- a/Components/Transforms/WeightedCombinationTransform/elxWeightedCombinationTransform.h +++ b/Components/Transforms/WeightedCombinationTransform/elxWeightedCombinationTransform.h @@ -80,7 +80,7 @@ namespace elastix template class ITK_TEMPLATE_EXPORT WeightedCombinationTransformElastix - : public itk::AdvancedCombinationTransform::CoordRepType, + : public itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension> , public elx::TransformBase { @@ -90,7 +90,7 @@ class ITK_TEMPLATE_EXPORT WeightedCombinationTransformElastix /** Standard ITK-stuff. */ using Self = WeightedCombinationTransformElastix; - using Superclass1 = itk::AdvancedCombinationTransform::CoordRepType, + using Superclass1 = itk::AdvancedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension>; using Superclass2 = elx::TransformBase; @@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT WeightedCombinationTransformElastix /** The ITK-class that provides most of the functionality, and * that is set as the "CurrentTransform" in the CombinationTransform */ using WeightedCombinationTransformType = - itk::WeightedCombinationTransform::CoordRepType, + itk::WeightedCombinationTransform::CoordinateType, elx::TransformBase::FixedImageDimension, elx::TransformBase::MovingImageDimension>; @@ -138,7 +138,7 @@ class ITK_TEMPLATE_EXPORT WeightedCombinationTransformElastix using typename Superclass2::ElastixType; using typename Superclass2::ParameterMapType; using typename Superclass2::RegistrationType; - using typename Superclass2::CoordRepType; + using typename Superclass2::CoordinateType; using typename Superclass2::FixedImageType; using typename Superclass2::MovingImageType; using ITKBaseType = typename Superclass2::ITKBaseType; diff --git a/Core/ComponentBaseClasses/elxInterpolatorBase.h b/Core/ComponentBaseClasses/elxInterpolatorBase.h index 8593ba9ee..e613c1471 100644 --- a/Core/ComponentBaseClasses/elxInterpolatorBase.h +++ b/Core/ComponentBaseClasses/elxInterpolatorBase.h @@ -59,10 +59,10 @@ class ITK_TEMPLATE_EXPORT InterpolatorBase : public BaseComponentSE /** Other typedef's. */ using InputImageType = typename ElastixType::MovingImageType; - using CoordRepType = ElastixBase::CoordRepType; + using CoordinateType = ElastixBase::CoordinateType; /** ITKBaseType. */ - using ITKBaseType = itk::InterpolateImageFunction; + using ITKBaseType = itk::InterpolateImageFunction; /** Retrieves this object as ITKBaseType. */ ITKBaseType * diff --git a/Core/ComponentBaseClasses/elxResampleInterpolatorBase.h b/Core/ComponentBaseClasses/elxResampleInterpolatorBase.h index 2997cb308..dd90723dd 100644 --- a/Core/ComponentBaseClasses/elxResampleInterpolatorBase.h +++ b/Core/ComponentBaseClasses/elxResampleInterpolatorBase.h @@ -58,10 +58,10 @@ class ITK_TEMPLATE_EXPORT ResampleInterpolatorBase : public BaseComponentSE; + using ITKBaseType = itk::InterpolateImageFunction; /** Typedef that is used in the elastix dll version. */ using ParameterMapType = typename ElastixType::ParameterMapType; diff --git a/Core/ComponentBaseClasses/elxResamplerBase.h b/Core/ComponentBaseClasses/elxResamplerBase.h index 93ba1aa99..1dd8e898f 100644 --- a/Core/ComponentBaseClasses/elxResamplerBase.h +++ b/Core/ComponentBaseClasses/elxResamplerBase.h @@ -95,10 +95,10 @@ class ITK_TEMPLATE_EXPORT ResamplerBase : public BaseComponentSE using InputImageType = typename ElastixType::MovingImageType; using OutputImageType = typename ElastixType::MovingImageType; // typedef typename ElastixType::FixedImageType OutputImageType; - using CoordRepType = ElastixBase::CoordRepType; + using CoordinateType = ElastixBase::CoordinateType; /** Other typedef's. */ - using ITKBaseType = itk::ResampleImageFilter; + using ITKBaseType = itk::ResampleImageFilter; /** Typedef's from ResampleImageFiler. */ using TransformType = typename ITKBaseType::TransformType; diff --git a/Core/ComponentBaseClasses/elxResamplerBase.hxx b/Core/ComponentBaseClasses/elxResamplerBase.hxx index 73a6b207b..0503bb9ce 100644 --- a/Core/ComponentBaseClasses/elxResamplerBase.hxx +++ b/Core/ComponentBaseClasses/elxResamplerBase.hxx @@ -355,7 +355,7 @@ ResamplerBase::WriteResultImage(OutputImageType * image, ITKBaseType & resampleImageFilter = this->GetSelf(); /** Check if ResampleInterpolator is the RayCastResampleInterpolator */ - const auto testptr = dynamic_cast *>( + const auto testptr = dynamic_cast *>( resampleImageFilter.GetInterpolator()); /** If RayCastResampleInterpolator is used reset the Transform to @@ -455,7 +455,7 @@ ResamplerBase::CreateItkResultImage() } /** Check if ResampleInterpolator is the RayCastResampleInterpolator */ - const auto testptr = dynamic_cast *>( + const auto testptr = dynamic_cast *>( resampleImageFilter.GetInterpolator()); /** If RayCastResampleInterpolator is used reset the Transform to diff --git a/Core/ComponentBaseClasses/elxTransformBase.h b/Core/ComponentBaseClasses/elxTransformBase.h index 735d18e82..693e0a31b 100644 --- a/Core/ComponentBaseClasses/elxTransformBase.h +++ b/Core/ComponentBaseClasses/elxTransformBase.h @@ -157,7 +157,7 @@ class ITK_TEMPLATE_EXPORT TransformBase : public BaseComponentSE using CommandLineEntryType = Configuration ::CommandLineEntryType; /** Elastix typedef's. */ - using CoordRepType = ElastixBase::CoordRepType; + using CoordinateType = ElastixBase::CoordinateType; using FixedImageType = typename TElastix::FixedImageType; using MovingImageType = typename TElastix::MovingImageType; @@ -172,7 +172,7 @@ class ITK_TEMPLATE_EXPORT TransformBase : public BaseComponentSE itkStaticConstMacro(MovingImageDimension, unsigned int, MovingImageType::ImageDimension); /** Other typedef's. */ - using CombinationTransformType = itk::AdvancedCombinationTransform; + using CombinationTransformType = itk::AdvancedCombinationTransform; using ITKBaseType = CombinationTransformType; using InitialTransformType = typename CombinationTransformType::InitialTransformType; @@ -336,7 +336,7 @@ class ITK_TEMPLATE_EXPORT TransformBase : public BaseComponentSE const auto & resampleImageFilter = *(this->m_Elastix->GetElxResamplerBase()->GetAsITKBaseType()); /** Create an setup Jacobian generator. */ - const auto jacGenerator = TSource::New(); + const auto jacGenerator = TSource::New(); jacGenerator->SetTransform(this->GetAsITKBaseType()); jacGenerator->SetOutputSize(resampleImageFilter.GetSize()); diff --git a/Core/ComponentBaseClasses/elxTransformBase.hxx b/Core/ComponentBaseClasses/elxTransformBase.hxx index bc9d85500..bbb1b0a7c 100644 --- a/Core/ComponentBaseClasses/elxTransformBase.hxx +++ b/Core/ComponentBaseClasses/elxTransformBase.hxx @@ -724,7 +724,7 @@ TransformBase::TransformPointsSomePoints(const std::string & filename) using DummyIPPPixelType = unsigned char; using MeshTraitsType = - itk::DefaultStaticMeshTraits; + itk::DefaultStaticMeshTraits; using PointSetType = itk::PointSet; using DeformationVectorType = itk::Vector; @@ -1051,7 +1051,7 @@ TransformBase::GenerateDeformationFieldImage() const -> typename Defor const auto & resampleImageFilter = *(this->m_Elastix->GetElxResamplerBase()->GetAsITKBaseType()); /** Create an setup deformation field generator. */ - const auto defGenerator = itk::TransformToDisplacementFieldFilter::New(); + const auto defGenerator = itk::TransformToDisplacementFieldFilter::New(); defGenerator->SetSize(resampleImageFilter.GetSize()); defGenerator->SetOutputSpacing(resampleImageFilter.GetOutputSpacing()); defGenerator->SetOutputOrigin(resampleImageFilter.GetOutputOrigin()); diff --git a/Core/Kernel/elxElastixBase.h b/Core/Kernel/elxElastixBase.h index 836f24ecc..42d7cdc87 100644 --- a/Core/Kernel/elxElastixBase.h +++ b/Core/Kernel/elxElastixBase.h @@ -170,7 +170,7 @@ class ElastixBase using FlatDirectionCosinesType = std::vector; /** Type for representation of the transform coordinates. */ - using CoordRepType = double; // itk::CostFunction::ParametersValueType + using CoordinateType = double; // itk::CostFunction::ParametersValueType /** Typedef that is used in the elastix dll version. */ using ParameterMapType = itk::ParameterMapInterface::ParameterMapType; diff --git a/Core/Main/itkElastixRegistrationMethod.h b/Core/Main/itkElastixRegistrationMethod.h index 0ca0ae474..d3c61b05e 100644 --- a/Core/Main/itkElastixRegistrationMethod.h +++ b/Core/Main/itkElastixRegistrationMethod.h @@ -413,7 +413,7 @@ class ITK_TEMPLATE_EXPORT ElastixRegistrationMethod : public itk::ImageSource; + AdvancedCombinationTransform; AdvancedCombinationTransformType * GetAdvancedCombinationTransform() const; diff --git a/Testing/itkAdvancedLinearInterpolatorTest.cxx b/Testing/itkAdvancedLinearInterpolatorTest.cxx index 1b048bc1c..32802393d 100644 --- a/Testing/itkAdvancedLinearInterpolatorTest.cxx +++ b/Testing/itkAdvancedLinearInterpolatorTest.cxx @@ -45,12 +45,12 @@ TestInterpolators() using RegionType = typename InputImageType::RegionType; // typedef typename RegionType::IndexType IndexType; using DirectionType = typename InputImageType::DirectionType; - using CoordRepType = double; + using CoordinateType = double; using CoefficientType = double; - using LinearInterpolatorType = itk::LinearInterpolateImageFunction; - using AdvancedLinearInterpolatorType = itk::AdvancedLinearInterpolateImageFunction; - using BSplineInterpolatorType = itk::BSplineInterpolateImageFunction; + using LinearInterpolatorType = itk::LinearInterpolateImageFunction; + using AdvancedLinearInterpolatorType = itk::AdvancedLinearInterpolateImageFunction; + using BSplineInterpolatorType = itk::BSplineInterpolateImageFunction; using ContinuousIndexType = typename LinearInterpolatorType::ContinuousIndexType; using CovariantVectorType = typename AdvancedLinearInterpolatorType::CovariantVectorType; using OutputType = typename AdvancedLinearInterpolatorType::OutputType; // double scalar diff --git a/Testing/itkGPUResampleImageFilterTest.cxx b/Testing/itkGPUResampleImageFilterTest.cxx index 30940029f..d660660f5 100644 --- a/Testing/itkGPUResampleImageFilterTest.cxx +++ b/Testing/itkGPUResampleImageFilterTest.cxx @@ -146,13 +146,13 @@ DefineInterpolator(typename InterpolatorType::Pointer & interpolator, { // Interpolator typedefs using InputImageType = typename InterpolatorType::InputImageType; - using CoordRepType = typename InterpolatorType::CoordRepType; - using CoefficientType = CoordRepType; + using CoordinateType = typename InterpolatorType::CoordinateType; + using CoefficientType = CoordinateType; // Typedefs for all interpolators - using NearestNeighborInterpolatorType = itk::NearestNeighborInterpolateImageFunction; - using LinearInterpolatorType = itk::LinearInterpolateImageFunction; - using BSplineInterpolatorType = itk::BSplineInterpolateImageFunction; + using NearestNeighborInterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using LinearInterpolatorType = itk::LinearInterpolateImageFunction; + using BSplineInterpolatorType = itk::BSplineInterpolateImageFunction; if (interpolatorName == "NearestNeighbor") {