Skip to content

Commit

Permalink
ENH: Control AverageAffineTransformFunction's verbosity via an ivar
Browse files Browse the repository at this point in the history
  • Loading branch information
dzenanz committed Feb 28, 2024
1 parent e9ec28e commit 51ee305
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 61 deletions.
26 changes: 17 additions & 9 deletions Utilities/itkAverageAffineTransformFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -67,6 +67,8 @@ template <typename TParametersValueType>
class HelperType<Dispatcher<2>, TParametersValueType>
{
public:
bool verbose;

typedef ANTSCenteredAffine2DTransform<TParametersValueType> InternalAffineTransformType;

typedef typename HelperCommonType<InternalAffineTransformType>::InternalAffineTransformPointerType
Expand All @@ -77,23 +79,25 @@ 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
template <typename TParametersValueType>
class HelperType<Dispatcher<3>, TParametersValueType>
{
public:
bool verbose;

typedef ANTSAffine3DTransform<TParametersValueType> InternalAffineTransformType;

typedef typename HelperCommonType<InternalAffineTransformType>::InternalAffineTransformPointerType
Expand All @@ -104,16 +108,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

Expand Down Expand Up @@ -160,6 +164,10 @@ class AverageAffineTransformFunction
void
AverageMultipleAffineTransform(const PointType & center_output, GenericAffineTransformPointerType & affine_output);

/** Whether progress and debugging information are printed to standard output (cout).
* It is on by default for backwards compatibility. */
bool verbose = true;

/** Set to false to ignore rotation and translation. */
bool useRigid = true;

Expand Down
Loading

0 comments on commit 51ee305

Please sign in to comment.