Skip to content

COMP: Use ITK 5.1.0 strongly typed enums in elxTransformBase #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
N-Dekker merged 1 commit into from
Sep 1, 2020
Merged

COMP: Use ITK 5.1.0 strongly typed enums in elxTransformBase #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common/OpenCL/ITKimprovements/itkOpenCLLogger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ OpenCLLogger::Initialize()
}

// Create an ITK Logger
LoggerBase::TimeStampFormatType timeStampFormat = LoggerBase::HUMANREADABLE;
LoggerBaseEnums::TimeStampFormat timeStampFormat = LoggerBaseEnums::TimeStampFormat::HUMANREADABLE;
this->SetTimeStampFormat( timeStampFormat );
const std::string humanReadableFormat = "%b %d %Y %H:%M:%S";
this->SetHumanReadableFormat( humanReadableFormat );
Expand Down
6 changes: 3 additions & 3 deletions Common/Transforms/itkAdvancedBSplineDeformableTransformBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class AdvancedBSplineDeformableTransformBase :
InputCovariantVectorType;
typedef typename Superclass::OutputCovariantVectorType
OutputCovariantVectorType;
typedef typename Superclass::TransformCategoryType TransformCategoryType;
typedef typename Superclass::TransformCategoryEnum TransformCategoryEnum;

typedef typename Superclass
::NonZeroJacobianIndicesType NonZeroJacobianIndicesType;
Expand Down Expand Up @@ -267,9 +267,9 @@ class AdvancedBSplineDeformableTransformBase :
/** Indicates the category transform.
* e.g. an affine transform, or a local one, e.g. a deformation field.
*/
TransformCategoryType GetTransformCategory( void ) const override
TransformCategoryEnum GetTransformCategory( void ) const override
{
return Self::BSpline;
return TransformCategoryEnum::BSpline;
}


Expand Down
4 changes: 2 additions & 2 deletions Common/Transforms/itkAdvancedCombinationTransform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class AdvancedCombinationTransform :
typedef typename Superclass::InternalMatrixType InternalMatrixType;
typedef typename Superclass::InverseTransformBaseType InverseTransformBaseType;
typedef typename Superclass::InverseTransformBasePointer InverseTransformBasePointer;
typedef typename Superclass::TransformCategoryType TransformCategoryType;
typedef typename Superclass::TransformCategoryEnum TransformCategoryEnum;
typedef typename Superclass::MovingImageGradientType MovingImageGradientType;
typedef typename Superclass::MovingImageGradientValueType MovingImageGradientValueType;

Expand Down Expand Up @@ -231,7 +231,7 @@ class AdvancedCombinationTransform :
* are linear, then return category Linear. Otherwise if all
* transforms set to optimize are DisplacementFields, then
* return DisplacementField category. */
TransformCategoryType GetTransformCategory() const override;
TransformCategoryEnum GetTransformCategory() const override;

/** Whether the advanced transform has nonzero matrices. */
bool GetHasNonZeroSpatialHessian( void ) const override;
Expand Down
6 changes: 3 additions & 3 deletions Common/Transforms/itkAdvancedCombinationTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,20 +245,20 @@ AdvancedCombinationTransform< TScalarType, NDimensions >
*/

template< typename TScalarType, unsigned int NDimensions >
typename AdvancedCombinationTransform< TScalarType, NDimensions >::TransformCategoryType
typename AdvancedCombinationTransform< TScalarType, NDimensions >::TransformCategoryEnum
AdvancedCombinationTransform< TScalarType, NDimensions >
::GetTransformCategory() const
{
// Check if all linear
const bool isLinearTransform = this->IsLinear();
if( isLinearTransform )
{
return Self::Linear;
return TransformCategoryEnum::Linear;
}

// It is unclear how you would prefer to define the rest of them,
// lets just return Self::UnknownTransformCategory for now
return Self::UnknownTransformCategory;
return TransformCategoryEnum::UnknownTransformCategory;
}


Expand Down
6 changes: 3 additions & 3 deletions Common/Transforms/itkAdvancedIdentityTransform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class AdvancedIdentityTransform :
/** Type of the input parameters. */
typedef typename Superclass::ParametersType ParametersType;
typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
typedef typename Superclass::TransformCategoryType TransformCategoryType;
typedef typename Superclass::TransformCategoryEnum TransformCategoryEnum;

/** Type of the Jacobian matrix. */
typedef typename Superclass::JacobianType JacobianType;
Expand Down Expand Up @@ -183,9 +183,9 @@ class AdvancedIdentityTransform :
/** Indicates the category transform.
* e.g. an affine transform, or a local one, e.g. a deformation field.
*/
TransformCategoryType GetTransformCategory() const override
TransformCategoryEnum GetTransformCategory() const override
{
return Self::Linear;
return TransformCategoryEnum::Linear;
}


Expand Down
6 changes: 3 additions & 3 deletions Common/Transforms/itkAdvancedMatrixOffsetTransformBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class AdvancedMatrixOffsetTransformBase :
typedef typename Superclass::OutputVnlVectorType OutputVnlVectorType;
typedef typename Superclass::InputPointType InputPointType;
typedef typename Superclass::OutputPointType OutputPointType;
typedef typename Superclass::TransformCategoryType TransformCategoryType;
typedef typename Superclass::TransformCategoryEnum TransformCategoryEnum;

typedef typename Superclass
::NonZeroJacobianIndicesType NonZeroJacobianIndicesType;
Expand Down Expand Up @@ -388,9 +388,9 @@ class AdvancedMatrixOffsetTransformBase :
/** Indicates the category transform.
* e.g. an affine transform, or a local one, e.g. a deformation field.
*/
TransformCategoryType GetTransformCategory() const override
TransformCategoryEnum GetTransformCategory() const override
{
return Self::Linear;
return TransformCategoryEnum::Linear;
}


Expand Down
6 changes: 3 additions & 3 deletions Common/Transforms/itkAdvancedTranslationTransform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ITK_EXPORT AdvancedTranslationTransform :
typedef typename Superclass::ParametersType ParametersType;
typedef typename Superclass::FixedParametersType FixedParametersType;
typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
typedef typename Superclass::TransformCategoryType TransformCategoryType;
typedef typename Superclass::TransformCategoryEnum TransformCategoryEnum;

/** Standard Jacobian container. */
typedef typename Superclass::JacobianType JacobianType;
Expand Down Expand Up @@ -233,9 +233,9 @@ class ITK_EXPORT AdvancedTranslationTransform :
/** Indicates the category transform.
* e.g. an affine transform, or a local one, e.g. a deformation field.
*/
TransformCategoryType GetTransformCategory() const override
TransformCategoryEnum GetTransformCategory() const override
{
return Self::Linear;
return TransformCategoryEnum::Linear;
}


Expand Down
10 changes: 5 additions & 5 deletions Components/Optimizers/RegularStepGradientDescent/elxRegularStepGradientDescent.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,23 @@ RegularStepGradientDescent< TElastix >
switch( this->GetStopCondition() )
{

case GradientMagnitudeTolerance:
case StopConditionEnum::GradientMagnitudeTolerance:
stopcondition = "Minimum gradient magnitude has been reached";
break;

case StepTooSmall:
case StopConditionEnum::StepTooSmall:
stopcondition = "Minimum step size has been reached";
break;

case MaximumNumberOfIterations:
case StopConditionEnum::MaximumNumberOfIterations:
stopcondition = "Maximum number of iterations has been reached";
break;

case ImageNotAvailable:
case StopConditionEnum::ImageNotAvailable:
stopcondition = "No image available";
break;

case CostFunctionError:
case StopConditionEnum::CostFunctionError:
stopcondition = "Error in cost function";
break;

Expand Down
1 change: 0 additions & 1 deletion Components/Optimizers/SimultaneousPerturbation/elxSimultaneousPerturbation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ class SimultaneousPerturbation :
/** Typedef's inherited from Superclass1.*/
typedef Superclass1::CostFunctionType CostFunctionType;
typedef Superclass1::CostFunctionPointer CostFunctionPointer;
typedef Superclass1::StopConditionType StopConditionType;

/** Typedef's inherited from Elastix.*/
typedef typename Superclass2::ElastixType ElastixType;
Expand Down
4 changes: 2 additions & 2 deletions Components/Optimizers/SimultaneousPerturbation/elxSimultaneousPerturbation.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ SimultaneousPerturbation< TElastix >
switch( this->GetStopCondition() )
{

case MaximumNumberOfIterations:
case StopConditionSPSAOptimizerEnum::MaximumNumberOfIterations:
stopcondition = "Maximum number of iterations has been reached";
break;

case MetricError:
case StopConditionSPSAOptimizerEnum::MetricError:
stopcondition = "Error in metric";
break;

Expand Down
5 changes: 3 additions & 2 deletions Core/ComponentBaseClasses/elxTransformBase.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "itkMeshFileReader.h"
#include "itkMeshFileWriter.h"
#include "itkTransformMeshFilter.h"
#include "itkCommonEnums.h"

namespace itk
{
Expand Down Expand Up @@ -72,15 +73,15 @@ public:
void Execute( Object * caller, const EventObject & ) override
{
CallerType * castcaller = dynamic_cast< CallerType * >( caller );
castcaller->GetModifiableImageIO()->SetPixelType( ImageIOBase::VECTOR );
castcaller->GetModifiableImageIO()->SetPixelType( CommonEnums::IOPixel::VECTOR );
}


void Execute( const Object * caller, const EventObject & ) override
{
CallerType * castcaller = const_cast< CallerType * >(
dynamic_cast< const CallerType * >( caller ) );
castcaller->GetModifiableImageIO()->SetPixelType( ImageIOBase::VECTOR );
castcaller->GetModifiableImageIO()->SetPixelType( CommonEnums::IOPixel::VECTOR );
}


Expand Down
2 changes: 1 addition & 1 deletion Testing/CI/Azure/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
ITKv5_VERSION: v5.0.1
ITKv5_VERSION: v5.1.0
ITK_SOURCE_DIR: $(Agent.BuildDirectory)/ITK-source
ITK_BINARY_DIR: $(Agent.BuildDirectory)/ITK-build
ELASTIX_SOURCE_DIR: $(Build.Repository.LocalPath)
Expand Down