STYLE: Let ComputeJacobianTerms use its own template parameters

The indirection via aliases (`FixedImageType = TFixedImage`, `TransformType = TTransform`) does not seem very useful.
SuperElastix · Dec 4, 2024 · bb8cbbe · bb8cbbe
1 parent d4476a5
commit bb8cbbe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/Common/itkComputeJacobianTerms.h b/Common/itkComputeJacobianTerms.h
@@ -54,8 +54,8 @@ class ITK_TEMPLATE_EXPORT ComputeJacobianTerms : public Object
   /** typedef  */
   using FixedImageType = TFixedImage;
   using TransformType = TTransform;
-  using TransformPointer = typename TransformType::Pointer;
-  using FixedImageRegionType = typename FixedImageType::RegionType;
+  using TransformPointer = typename TTransform::Pointer;
+  using FixedImageRegionType = typename TFixedImage::RegionType;
 
   /** Type for the mask of the fixed image. Only pixels that are "inside"
    * this mask will be considered for the computation of the Jacobian terms.
@@ -68,10 +68,10 @@ class ITK_TEMPLATE_EXPORT ComputeJacobianTerms : public Object
   using ScalesType = ScaledSingleValuedNonLinearOptimizer::ScalesType;
 
   /** Set the fixed image. */
-  itkSetConstObjectMacro(FixedImage, FixedImageType);
+  itkSetConstObjectMacro(FixedImage, TFixedImage);
 
   /** Set the transform. */
-  itkSetObjectMacro(Transform, TransformType);
+  itkSetObjectMacro(Transform, TTransform);
 
   /** Set/Get the fixed image mask. */
   itkSetObjectMacro(FixedImageMask, FixedImageMaskType);
@@ -117,7 +117,7 @@ class ITK_TEMPLATE_EXPORT ComputeJacobianTerms : public Object
   ~ComputeJacobianTerms() override = default;
 
   /** Samplers. */
-  using ImageGridSamplerType = ImageGridSampler<FixedImageType>;
+  using ImageGridSamplerType = ImageGridSampler<TFixedImage>;
   using ImageGridSamplerPointer = typename ImageGridSamplerType::Pointer;
   using ImageSampleContainerType = typename ImageGridSamplerType ::ImageSampleContainerType;
   using ImageSampleContainerPointer = typename ImageSampleContainerType::Pointer;
@@ -129,12 +129,12 @@ class ITK_TEMPLATE_EXPORT ComputeJacobianTerms : public Object
   SampleFixedImageForJacobianTerms() const;
 
 private:
-  typename FixedImageType::ConstPointer m_FixedImage{ nullptr };
-  FixedImageRegionType                  m_FixedImageRegion{};
-  FixedImageMaskConstPointer            m_FixedImageMask{ nullptr };
-  TransformPointer                      m_Transform{ nullptr };
-  ScalesType                            m_Scales{};
-  bool                                  m_UseScales{ false };
+  typename TFixedImage::ConstPointer m_FixedImage{ nullptr };
+  FixedImageRegionType               m_FixedImageRegion{};
+  FixedImageMaskConstPointer         m_FixedImageMask{ nullptr };
+  TransformPointer                   m_Transform{ nullptr };
+  ScalesType                         m_Scales{};
+  bool                               m_UseScales{ false };
 
   unsigned int  m_MaxBandCovSize{ 0 };
   unsigned int  m_NumberOfBandStructureSamples{ 0 };

diff --git a/Common/itkComputeJacobianTerms.hxx b/Common/itkComputeJacobianTerms.hxx
@@ -52,10 +52,10 @@ ComputeJacobianTerms<TFixedImage, TTransform>::Compute() const -> Terms
    * Term 4: maxJCJ, see (54)
    */
 
-  using FixedImagePointType = typename FixedImageType::PointType;
-  using JacobianType = typename TransformType::JacobianType;
-  using NumberOfParametersType = typename TransformType::NumberOfParametersType;
-  using NonZeroJacobianIndicesType = typename TransformType::NonZeroJacobianIndicesType;
+  using FixedImagePointType = typename TFixedImage::PointType;
+  using JacobianType = typename TTransform::JacobianType;
+  using NumberOfParametersType = typename TTransform::NumberOfParametersType;
+  using NonZeroJacobianIndicesType = typename TTransform::NonZeroJacobianIndicesType;
 
   /** Get samples. */
   const ImageSampleContainerPointer sampleContainer = SampleFixedImageForJacobianTerms();