ENH: Refactor AverageAffineTransformFunction (remove NoRigid variant)

Examples/AverageAffineTransformNoRigid.cxx

@@ -7,7 +7,7 @@
 #include "itkMatrixOffsetTransformBase.h"
 #include "itkTransformFactory.h"
 
-#include "itkAverageAffineTransformNoRigidFunction.h"
+#include "itkAverageAffineTransformFunction.h"
 
 #include "itkTransformFileReader.h"
 #include "itkTransformFileWriter.h"
@@ -118,7 +118,7 @@ AverageAffineTransformNoRigid(char * output_affine_txt, char * reference_affine_
   //    typedef itk::WarpImageMultiTransformFilter<ImageType, ImageType,
   //            DisplacementFieldType, AffineTransformType> WarperType;
 
-  using WarperType = itk::AverageAffineTransformNoRigidFunction<AffineTransformType>;
+  using WarperType = itk::AverageAffineTransformFunction<AffineTransformType>;
 
   itk::TransformFactory<AffineTransformType>::RegisterTransform();
 
@@ -129,6 +129,7 @@ AverageAffineTransformNoRigid(char * output_affine_txt, char * reference_affine_
   // typename ImageFileReaderType::Pointer reader_img_ref = ImageFileReaderType::New();
 
   WarperType average_func;
+  average_func.useRigid = false;
   // warper->SetInput(img_mov);
   // warper->SetEdgePaddingValue( 0);
   //    VectorType pad;

Utilities/itkAverageAffineTransformFunction.h

@@ -160,6 +160,9 @@ class AverageAffineTransformFunction
   void
   AverageMultipleAffineTransform(const PointType & center_output, GenericAffineTransformPointerType & affine_output);
 
+  /** Set to false to ignore rotation and translation. */
+  bool useRigid = true;
+
 #ifdef ITK_USE_CONCEPT_CHECKING
   /** Begin concept checking */
   itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension<InputSpaceDimension, OutputSpaceDimension>));

Utilities/itkAverageAffineTransformFunction.hxx

@@ -100,8 +100,11 @@ AverageAffineTransformFunction<TTransform>::AverageMultipleAffineTransform(
 
   HelperType::ComputeAverageScaleParameters(m_InternalTransformList, average_parameters);
   HelperType::ComputeAverageShearingParameters(m_InternalTransformList, average_parameters);
-  HelperType::ComputeAverageRotationParameters(m_InternalTransformList, average_parameters);
-  HelperType::ComputeAverageTranslationParameters(m_InternalTransformList, average_parameters);
+  if (useRigid)
+  {
+    HelperType::ComputeAverageRotationParameters(m_InternalTransformList, average_parameters);
+    HelperType::ComputeAverageTranslationParameters(m_InternalTransformList, average_parameters);
+  }
 
   average_iaff->SetParameters(average_parameters);
   average_iaff->SetCenter(reference_center);