Skip to content

Warp image filter vector image support #9

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

Closed
jmichel-otb wants to merge 2 commits into from
Closed

Warp image filter vector image support #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e974f5
ENH: Support of VectorImage as template parameters for WarpImageFilter
jmichel-otb Oct 26, 2015
091a58e
ENH: Modifying initialization of m_EdgePaddingValue to follow the sam…
jmichel-otb Oct 30, 2015
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
3 changes: 2 additions & 1 deletion Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class WarpImageFilter:
typedef typename OutputImageType::IndexValueType IndexValueType;
typedef typename OutputImageType::SizeType SizeType;
typedef typename OutputImageType::PixelType PixelType;
typedef typename OutputImageType::InternalPixelType PixelComponentType;
typedef typename OutputImageType::SpacingType SpacingType;

/** Determine the image dimension. */
Expand Down Expand Up @@ -240,7 +241,7 @@ class WarpImageFilter:
itkConceptMacro( SameDimensionCheck2,
( Concept::SameDimension< ImageDimension, DisplacementFieldDimension > ) );
itkConceptMacro( InputHasNumericTraitsCheck,
( Concept::HasNumericTraits< typename TInputImage::PixelType > ) );
( Concept::HasNumericTraits< typename TInputImage::InternalPixelType > ) );
itkConceptMacro( DisplacementFieldHasNumericTraitsCheck,
( Concept::HasNumericTraits< typename TDisplacementField::PixelType::ValueType > ) );
// End concept checking
Expand Down
28 changes: 26 additions & 2 deletions Modules/Filtering/ImageGrid/include/itkWarpImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "itkImageRegionIteratorWithIndex.h"
#include "itkImageAlgorithm.h"
#include "itkNumericTraits.h"
#include "itkDefaultConvertPixelTraits.h"
#include "itkProgressReporter.h"
#include "itkContinuousIndex.h"
#include "vnl/vnl_math.h"
Expand All @@ -43,7 +44,7 @@ WarpImageFilter< TInputImage, TOutputImage, TDisplacementField >
m_OutputOrigin.Fill(0.0);
m_OutputDirection.SetIdentity();
m_OutputSize.Fill(0);
m_EdgePaddingValue = NumericTraits< PixelType >::ZeroValue();
m_EdgePaddingValue = NumericTraits< PixelType >::ZeroValue(m_EdgePaddingValue);
m_OutputStartIndex.Fill(0);
// Setup default interpolator
typename DefaultInterpolatorType::Pointer interp =
Expand Down Expand Up @@ -179,6 +180,29 @@ WarpImageFilter< TInputImage, TOutputImage, TDisplacementField >
}
DisplacementFieldPointer fieldPtr = this->GetDisplacementField();

unsigned int nbComponents = DefaultConvertPixelTraits<PixelType>::GetNumberOfComponents(m_EdgePaddingValue);

if(nbComponents!= this->GetInput()->GetNumberOfComponentsPerPixel())
{
PixelComponentType zeroComponent = NumericTraits<PixelComponentType>::ZeroValue(zeroComponent);
nbComponents = this->GetInput()->GetNumberOfComponentsPerPixel();
NumericTraits<PixelType>::SetLength(m_EdgePaddingValue,nbComponents);

for(unsigned int n = 0; n < nbComponents;++n)
{
DefaultConvertPixelTraits<PixelType>::SetNthComponent(n,m_EdgePaddingValue,zeroComponent);
}
}

if (NumericTraits<PixelType>::GetLength(m_EdgePaddingValue)
!= this->GetInput()->GetNumberOfComponentsPerPixel() )
{
// Assume EdgePaddingValue has not been set externally
// initialize it here with ZeroValue, when we know the number of components
const PixelType& pixel = this->GetInput()->GetPixel( this->GetInput()->GetBufferedRegion().GetIndex() );
m_EdgePaddingValue = NumericTraits<PixelType>::ZeroValue( pixel );
}

// Connect input image to interpolator
m_Interpolator->SetInputImage( this->GetInput() );

Expand Down Expand Up @@ -292,7 +316,7 @@ WarpImageFilter< TInputImage, TOutputImage, TDisplacementField >
{
const DisplacementType input =
fieldPtr->GetPixel(neighIndex);
for ( unsigned int k = 0; k < ImageDimension; k++ )
for ( unsigned int k = 0; k < NumericTraits<DisplacementType>::GetLength(input); k++ )
{
output[k] += overlap * static_cast< double >( input[k] );
}
Expand Down
11 changes: 9 additions & 2 deletions Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "itkWarpImageFilter.h"
#include "itkVectorCastImageFilter.h"
#include "itkStreamingImageFilter.h"
#include "itkVectorImage.h"
#include "itkMath.h"

// class to produce a linear image pattern
Expand Down Expand Up @@ -97,8 +98,8 @@ int itkWarpImageFilterTest(int, char* [] )
typedef float PixelType;
enum { ImageDimension = 2 };
typedef itk::Image<PixelType,ImageDimension> ImageType;

typedef itk::Vector<float,ImageDimension> VectorType;
typedef itk::VectorImage<PixelType,ImageDimension> VectorImageType;
typedef itk::Vector<float,ImageDimension> VectorType;
typedef itk::Image<VectorType,ImageDimension> FieldType;

bool testPassed = true;
Expand Down Expand Up @@ -169,7 +170,13 @@ int itkWarpImageFilterTest(int, char* [] )
}

//=============================================================
std::cout << "Instanciate WarpImageFilter with VectorImage.";
std::cout << std::endl;

typedef itk::WarpImageFilter<VectorImageType,VectorImageType,VectorImageType> WarpVectorImageFilterType;
WarpVectorImageFilterType::Pointer warpVectorImageFilter = WarpVectorImageFilterType::New();

//=============================================================
std::cout << "Run WarpImageFilter in standalone mode with progress.";
std::cout << std::endl;
typedef itk::WarpImageFilter<ImageType,ImageType,FieldType> WarperType;
Expand Down