Authors belong to:
- University of LYON http://www.universite-lyon.fr/
- - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
+ - Léon Bérard cancer center http://www.centreleonberard.fr
- CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
This software is distributed WITHOUT ANY WARRANTY; without even
- BSD See included LICENSE.txt file
- CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
#ifndef __clitkDemonsDeformableRegistrationGenericFilter_txx
#define __clitkDemonsDeformableRegistrationGenericFilter_txx
#include "clitkDemonsDeformableRegistrationGenericFilter.h"
//find the multiresolution filter
// typedef typename RegistrationFilterType::FixedImageType InternalImageType;
// typedef typename RegistrationFilterType::MovingImageType MovingImageType;
- typedef typename RegistrationFilterType::DeformationFieldType DeformationFieldType;
- typedef clitk::MultiResolutionPDEDeformableRegistration<FixedImageType, MovingImageType, DeformationFieldType> MultiResolutionRegistrationType;
+ typedef typename RegistrationFilterType::DisplacementFieldType DisplacementFieldType;
+ typedef clitk::MultiResolutionPDEDeformableRegistration<FixedImageType, MovingImageType, DisplacementFieldType> MultiResolutionRegistrationType;
typedef CommandResolutionLevelUpdate<MultiResolutionRegistrationType> LevelObserver;
protected:
// =======================================================
// The multiresolution scheme
// =======================================================
- if (threadsGiven) multiResolutionFilter->SetNumberOfThreads(threads);
+ if (threadsGiven) {
+#if ITK_VERSION_MAJOR <= 4
+ multiResolutionFilter->SetNumberOfThreads(threads);
+#else
+ multiResolutionFilter->SetNumberOfWorkUnits(threads);
+#endif
+ }
unsigned int nLevels=m_ArgsInfo.levels_arg;
if (m_Verbose) std::cout<<"Setting the number of resolution levels to "<<nLevels<<"..."<<std::endl;
multiResolutionFilter->SetFixedImage( fixedImage );
multiResolutionFilter->SetNumberOfLevels( nLevels );
multiResolutionFilter->SetFixedImagePyramid( fixedImagePyramid );
multiResolutionFilter->SetMovingImagePyramid( movingImagePyramid );
- if (threadsGiven) multiResolutionFilter->SetNumberOfThreads( threads );
-
+ if (threadsGiven) {
+#if ITK_VERSION_MAJOR <= 4
+ multiResolutionFilter->SetNumberOfThreads( threads );
+#else
+ multiResolutionFilter->SetNumberOfWorkUnits( threads );
+#endif
+ }
+
//------------------------------------
//Set the number of iterations
//------------------------------------
//JV TODO
// pdeFilter->SetMaximumError(m_ArgsInfo.maxError_arg);
// pdeFilter->SetMaximumKernelWidth(m_ArgsInfo.maxError_arg);
- pdeFilter->SetSmoothDeformationField(!m_ArgsInfo.fluid_flag);
+ pdeFilter->SetSmoothDisplacementField(!m_ArgsInfo.fluid_flag);
pdeFilter->SetSmoothUpdateField(m_ArgsInfo.fluid_flag);
pdeFilter->SetUseImageSpacing( m_ArgsInfo.spacing_flag );
typedef itk::WarpImageFilter< MovingImageType, FixedImageType, DeformationFieldType > WarpFilterType;
typename WarpFilterType::Pointer warp = WarpFilterType::New();
- warp->SetDeformationField( deformationField );
+ warp->SetDisplacementField( deformationField );
warp->SetInput( movingImageReader->GetOutput() );
warp->SetOutputOrigin( fixedImage->GetOrigin() );
warp->SetOutputSpacing( fixedImage->GetSpacing() );