Merge pull request #1684 from dzenanz/refactorAvgAffine

Refactor AverageAffineTransformFunction
ANTsX · Feb 28, 2024 · 4b13b0c · 4b13b0c
2 parents fc0e56d + 911eadf
commit 4b13b0c
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 607 deletions.
diff --git a/Examples/AverageAffineTransform.cxx b/Examples/AverageAffineTransform.cxx
@@ -129,6 +129,7 @@ AverageAffineTransform(char * output_affine_txt, char * reference_affine_txt, TR
  // typename ImageFileReaderType::Pointer reader_img_ref = ImageFileReaderType::New();
 
  WarperType average_func;
+ average_func.verbose = true;
  // warper->SetInput(img_mov);
  // warper->SetEdgePaddingValue( 0);
  // VectorType pad;

diff --git a/Examples/AverageAffineTransformNoRigid.cxx b/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,8 @@ AverageAffineTransformNoRigid(char * output_affine_txt, char * reference_affine_
  // typename ImageFileReaderType::Pointer reader_img_ref = ImageFileReaderType::New();
 
  WarperType average_func;
+ average_func.verbose = true;
+ average_func.useRigid = false;
  // warper->SetInput(img_mov);
  // warper->SetEdgePaddingValue( 0);
  // VectorType pad;

diff --git a/Utilities/itkAverageAffineTransformFunction.h b/Utilities/itkAverageAffineTransformFunction.h
@@ -52,7 +52,7 @@ struct HelperCommonType
  ComputeAveragePartialParameters(InternalTransformListType & transform_list,
  ParametersType & average_parameters,
  unsigned int iStart,
- unsigned int iEnd);
+ unsigned int iEnd, bool verbose);
 };
 
 template <typename T, typename TParametersValueType>
@@ -77,16 +77,16 @@ class HelperType<Dispatcher<2>, TParametersValueType>
  typedef typename HelperCommonType<InternalAffineTransformType>::ParametersType ParametersType;
 
  static void
- ComputeAverageScaleParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageScaleParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 
  static void
- ComputeAverageShearingParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageShearingParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 
  static void
- ComputeAverageRotationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageRotationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 
  static void
- ComputeAverageTranslationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageTranslationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 };
 
 // explicit specialization for 3D affine transform
@@ -104,16 +104,16 @@ class HelperType<Dispatcher<3>, TParametersValueType>
  typedef typename HelperCommonType<InternalAffineTransformType>::ParametersType ParametersType;
 
  static void
- ComputeAverageScaleParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageScaleParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 
  static void
- ComputeAverageShearingParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageShearingParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 
  static void
- ComputeAverageRotationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageRotationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 
  static void
- ComputeAverageTranslationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters);
+ ComputeAverageTranslationParameters(InternalTransformListType & transform_list, ParametersType & average_parameters, bool verbose);
 };
 } // namespace AverageAffineTransformFunctionHelperNameSpace
 
@@ -160,6 +160,12 @@ class AverageAffineTransformFunction
  void
  AverageMultipleAffineTransform(const PointType & center_output, GenericAffineTransformPointerType & affine_output);
 
+ /** Whether progress and debugging information are printed to standard output (cout). */
+ bool verbose = false;
+
+ /** 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>));