STYLE: FUTURE_LEGACY_REMOVE ImageToImageMetric::m_InterpolatorIsBSpline

m_InterpolatorIsBSpline is just equal to `m_BSplineInterpolator != nullptr`, so it is redundant and not really necessary.
InsightSoftwareConsortium · Mar 17, 2024 · 8515928 · 8515928
1 parent db9cfea
commit 8515928
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Modules/Registration/Common/include/itkImageToImageMetric.h b/Modules/Registration/Common/include/itkImageToImageMetric.h
@@ -537,8 +537,13 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetric : public SingleValuedCostFunction
                                 ImageDerivativesType & movingImageGradient,
                                 ThreadIdType           threadId) const;
 
-  /** Boolean to indicate if the interpolator BSpline. */
+#ifndef ITK_FUTURE_LEGACY_REMOVE
+  /** Boolean to indicate if the interpolator BSpline.
+  \deprecated `m_InterpolatorIsBSpline` is intended to be removed, in the future. Please use `m_BSplineInterpolator`
+  instead. For example, `if (m_InterpolatorIsBSpline)` may be rewritten as `if (m_BSplineInterpolator)`. */
   bool m_InterpolatorIsBSpline{ false };
+#endif
+
   /** Pointer to BSplineInterpolator. */
   typename BSplineInterpolatorType::Pointer m_BSplineInterpolator{};
 

diff --git a/Modules/Registration/Common/include/itkImageToImageMetric.hxx b/Modules/Registration/Common/include/itkImageToImageMetric.hxx
@@ -335,13 +335,9 @@ ImageToImageMetric<TFixedImage, TMovingImage>::MultiThreadingInitialize()
   //  Otherwise, we instantiate an external central difference
   //  derivative calculator.
   //
-  m_InterpolatorIsBSpline = true;
-
   auto * testPtr = dynamic_cast<BSplineInterpolatorType *>(this->m_Interpolator.GetPointer());
   if (!testPtr)
   {
-    m_InterpolatorIsBSpline = false;
-
     m_DerivativeCalculator = DerivativeFunctionType::New();
     m_DerivativeCalculator->UseImageDirectionOn();
 
@@ -360,6 +356,10 @@ ImageToImageMetric<TFixedImage, TMovingImage>::MultiThreadingInitialize()
     itkDebugMacro("Interpolator is BSpline");
   }
 
+#ifndef ITK_FUTURE_LEGACY_REMOVE
+  m_InterpolatorIsBSpline = m_BSplineInterpolator != nullptr;
+#endif
+
   //
   //  Check if the transform is of type BSplineTransform.
   //
@@ -839,7 +839,7 @@ ImageToImageMetric<TFixedImage, TMovingImage>::TransformPoint(unsigned int
       sampleOk = sampleOk && m_MovingImageMask->IsInsideInWorldSpace(mappedPoint);
     }
 
-    if (m_InterpolatorIsBSpline)
+    if (m_BSplineInterpolator)
     {
       // Check if mapped point inside image buffer
       sampleOk = sampleOk && m_BSplineInterpolator->IsInsideBuffer(mappedPoint);
@@ -951,7 +951,7 @@ ImageToImageMetric<TFixedImage, TMovingImage>::TransformPointWithDerivatives(uns
       sampleOk = sampleOk && m_MovingImageMask->IsInsideInWorldSpace(mappedPoint);
     }
 
-    if (m_InterpolatorIsBSpline)
+    if (m_BSplineInterpolator)
     {
       // Check if mapped point inside image buffer
       sampleOk = sampleOk && m_BSplineInterpolator->IsInsideBuffer(mappedPoint);
@@ -980,7 +980,7 @@ ImageToImageMetric<TFixedImage, TMovingImage>::ComputeImageDerivatives(const Mov
                                                                        ImageDerivativesType &       gradient,
                                                                        ThreadIdType                 threadId) const
 {
-  if (m_InterpolatorIsBSpline)
+  if (m_BSplineInterpolator)
   {
     // Computed moving image gradient using derivative BSpline kernel.
     gradient = m_BSplineInterpolator->EvaluateDerivative(mappedPoint, threadId);
@@ -1301,7 +1301,9 @@ ImageToImageMetric<TFixedImage, TMovingImage>::PrintSelf(std::ostream & os, Inde
     os << "(null)" << std::endl;
   }
 
+#ifndef ITK_FUTURE_LEGACY_REMOVE
   os << indent << "InterpolatorIsBSpline: " << (m_InterpolatorIsBSpline ? "On" : "Off") << std::endl;
+#endif
 
   itkPrintSelfObjectMacro(BSplineInterpolator);
   itkPrintSelfObjectMacro(DerivativeCalculator);