Merge pull request #45 from thewtex/wrap-bspline

thewtex · web-flow · commit b4f2ae5b2d2a · 2019-11-08T18:18:12.000-05:00
Wrap bspline
diff --git a/include/itkCuberilleImageToMeshFilter.h b/include/itkCuberilleImageToMeshFilter.h
@@ -110,7 +110,7 @@ namespace itk
  * \ingroup Cuberille
  *
  */
-template < class TInputImage, class TOutputMesh, class TInterpolator=itk::LinearInterpolateImageFunction<TInputImage> >
+template < typename TInputImage, typename TOutputMesh, typename TInterpolator=itk::LinearInterpolateImageFunction<TInputImage> >
 class CuberilleImageToMeshFilter : public ImageToMeshFilter< TInputImage, TOutputMesh >
 {
 public:
@@ -275,7 +275,7 @@ class CuberilleImageToMeshFilter : public ImageToMeshFilter< TInputImage, TOutpu
 
   /** \class VertexLookupMap A private class providing vertex lookup functionality.
    *  \ingroup Cuberille */
-  template< class TMeshType >
+  template< typename TMeshType >
   class VertexLookupMap
     {
     public:
diff --git a/include/itkCuberilleImageToMeshFilter.hxx b/include/itkCuberilleImageToMeshFilter.hxx
@@ -28,7 +28,7 @@
 namespace itk
 {
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::CuberilleImageToMeshFilter() :
   m_IsoSurfaceValue( NumericTraits< InputPixelType >::One ),
@@ -43,22 +43,22 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
   this->SetNumberOfRequiredInputs(1);
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::~CuberilleImageToMeshFilter()
 {
   m_GradientInterpolator = nullptr;
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::SetInput(const InputImageType* image)
 {
   this->ProcessObject::SetNthInput(0, const_cast< InputImageType * >( image ) );
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::GenerateData()
@@ -89,7 +89,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
   // Create interpolator for pixel value
   if( m_Interpolator.IsNull() )
     {
-    m_Interpolator = InterpolatorType::New();
+    m_Interpolator = LinearInterpolateImageFunction< InputImageType >::New();
     }
   m_Interpolator->SetInputImage( image );
 
@@ -219,7 +219,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::SetVerticesFromFace( unsigned int face, bool *v )
@@ -235,7 +235,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
   }
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 typename TInputImage::IndexType
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::GetVertexLookupIndex( unsigned int vertex, typename TInputImage::IndexType index )
@@ -255,7 +255,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
   return result;
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::AddVertex( typename TOutputMesh::PointIdentifier &id,
@@ -276,7 +276,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
   mesh->GetPoints()->InsertElement( id++, vertex );
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::AddQuadFace( typename TOutputMesh::CellIdentifier &id,
@@ -331,7 +331,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
     }
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::ProjectVertexToIsoSurface( PointType &vertex )
@@ -513,7 +513,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::ComputeGradientImage()
@@ -534,7 +534,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
     }
 }
 
-template<class TInputImage, class TOutputMesh, class TInterpolator>
+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>
 void
 CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>
 ::PrintSelf( std::ostream& os, Indent indent ) const
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name='itk-cuberille',
-    version='2.0.2',
+    version='2.1.0',
     author='Dan Mueller',
     author_email='itk+community@discourse.itk.org',
     packages=['itk'],
diff --git a/wrapping/itkCuberilleImageToMeshFilter.wrap b/wrapping/itkCuberilleImageToMeshFilter.wrap
@@ -3,7 +3,7 @@ UNIQUE(types "${WRAP_ITK_SCALAR}")
 foreach(d ${ITK_WRAP_IMAGE_DIMS})
   foreach(t ${types})
     itk_wrap_template("${ITKM_I${t}${d}}M${ITKM_${t}}${d}"
-                      "${ITKT_I${t}${d}}, itk::Mesh< ${ITKT_${t}},${d} >")
+                      "${ITKT_I${t}${d}}, itk::Mesh< ${ITKT_${t}},${d} >, itk::InterpolateImageFunction< ${ITKT_I${t}${d}}, ${ITKT_D} >")
   endforeach()
 endforeach()
 itk_end_wrap_class()

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ namespace itk`
`110`	`110`	`* \ingroup Cuberille`
`111`	`111`	`*`
`112`	`112`	`*/`
`113`		`-template < class TInputImage, class TOutputMesh, class TInterpolator=itk::LinearInterpolateImageFunction<TInputImage> >`
	`113`	`+template < typename TInputImage, typename TOutputMesh, typename TInterpolator=itk::LinearInterpolateImageFunction<TInputImage> >`
`114`	`114`	`class CuberilleImageToMeshFilter : public ImageToMeshFilter< TInputImage, TOutputMesh >`
`115`	`115`	`{`
`116`	`116`	`public:`
`@@ -275,7 +275,7 @@ class CuberilleImageToMeshFilter : public ImageToMeshFilter< TInputImage, TOutpu`
`275`	`275`
`276`	`276`	`/** \class VertexLookupMap A private class providing vertex lookup functionality.`
`277`	`277`	`* \ingroup Cuberille */`
`278`		`- template< class TMeshType >`
	`278`	`+ template< typename TMeshType >`
`279`	`279`	`class VertexLookupMap`
`280`	`280`	`{`
`281`	`281`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`namespace itk`
`29`	`29`	`{`
`30`	`30`
`31`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`31`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`32`	`32`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`33`	`33`	`::CuberilleImageToMeshFilter() :`
`34`	`34`	`m_IsoSurfaceValue( NumericTraits< InputPixelType >::One ),`
`@@ -43,22 +43,22 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`43`	`43`	`this->SetNumberOfRequiredInputs(1);`
`44`	`44`	`}`
`45`	`45`
`46`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`46`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`47`	`47`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`48`	`48`	`::~CuberilleImageToMeshFilter()`
`49`	`49`	`{`
`50`	`50`	`m_GradientInterpolator = nullptr;`
`51`	`51`	`}`
`52`	`52`
`53`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`53`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`54`	`54`	`void`
`55`	`55`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`56`	`56`	`::SetInput(const InputImageType* image)`
`57`	`57`	`{`
`58`	`58`	`this->ProcessObject::SetNthInput(0, const_cast< InputImageType * >( image ) );`
`59`	`59`	`}`
`60`	`60`
`61`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`61`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`62`	`62`	`void`
`63`	`63`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`64`	`64`	`::GenerateData()`
`@@ -89,7 +89,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`89`	`89`	`// Create interpolator for pixel value`
`90`	`90`	`if( m_Interpolator.IsNull() )`
`91`	`91`	`{`
`92`		`- m_Interpolator = InterpolatorType::New();`
	`92`	`+ m_Interpolator = LinearInterpolateImageFunction< InputImageType >::New();`
`93`	`93`	`}`
`94`	`94`	`m_Interpolator->SetInputImage( image );`
`95`	`95`
`@@ -219,7 +219,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`219`	`219`
`220`	`220`	`}`
`221`	`221`
`222`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`222`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`223`	`223`	`void`
`224`	`224`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`225`	`225`	`::SetVerticesFromFace( unsigned int face, bool *v )`
`@@ -235,7 +235,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
`238`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`238`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`239`	`239`	`typename TInputImage::IndexType`
`240`	`240`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`241`	`241`	`::GetVertexLookupIndex( unsigned int vertex, typename TInputImage::IndexType index )`
`@@ -255,7 +255,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`255`	`255`	`return result;`
`256`	`256`	`}`
`257`	`257`
`258`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`258`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`259`	`259`	`void`
`260`	`260`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`261`	`261`	`::AddVertex( typename TOutputMesh::PointIdentifier &id,`
`@@ -276,7 +276,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`276`	`276`	`mesh->GetPoints()->InsertElement( id++, vertex );`
`277`	`277`	`}`
`278`	`278`
`279`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`279`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`280`	`280`	`void`
`281`	`281`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`282`	`282`	`::AddQuadFace( typename TOutputMesh::CellIdentifier &id,`
`@@ -331,7 +331,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
`334`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`334`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`335`	`335`	`void`
`336`	`336`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`337`	`337`	`::ProjectVertexToIsoSurface( PointType &vertex )`
`@@ -513,7 +513,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`513`	`513`
`514`	`514`	`}`
`515`	`515`
`516`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`516`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`517`	`517`	`void`
`518`	`518`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`519`	`519`	`::ComputeGradientImage()`
`@@ -534,7 +534,7 @@ CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`534`	`534`	`}`
`535`	`535`	`}`
`536`	`536`
`537`		`-template<class TInputImage, class TOutputMesh, class TInterpolator>`
	`537`	`+template<typename TInputImage, typename TOutputMesh, typename TInterpolator>`
`538`	`538`	`void`
`539`	`539`	`CuberilleImageToMeshFilter<TInputImage,TOutputMesh,TInterpolator>`
`540`	`540`	`::PrintSelf( std::ostream& os, Indent indent ) const`