Merge pull request #2 from thewtex/to-polydata

To polydata

Author: thewtex

include/itkMeshToPolyDataFilter.h

@@ -18,7 +18,7 @@
 #ifndef itkMeshToPolyDataFilter_h
 #define itkMeshToPolyDataFilter_h
 
-#include "itkImageToImageFilter.h"
+#include "itkProcessObject.h"
 
 namespace itk
 {
@@ -33,49 +33,47 @@ namespace itk
  * \ingroup MeshToPolyData
  *
  */
-template< typename TInputImage, typename TOutputImage >
-class MeshToPolyDataFilter: public ImageToImageFilter< TInputImage, TOutputImage >
+template< typename TInputMesh >
+class MeshToPolyDataFilter: public ProcessObject
 {
 public:
   ITK_DISALLOW_COPY_AND_ASSIGN(MeshToPolyDataFilter);
 
-  static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension;
-  static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension;
+  static constexpr unsigned int PointDimension = TInputMesh::PointDimension;
 
-  using InputImageType = TInputImage;
-  using OutputImageType = TInputImage;
-  using InputPixelType = typename InputImageType::PixelType;
-  using OutputPixelType = typename OutputImageType::PixelType;
+  using InputMeshType = TInputMesh;
 
   /** Standard class typedefs. */
-  using Self = MeshToPolyDataFilter< InputImageType, OutputImageType >;
-  using Superclass = ImageToImageFilter< InputImageType, OutputImageType >;
+  using Self = MeshToPolyDataFilter< InputMeshType >;
+  using Superclass = ProcessObject;
   using Pointer = SmartPointer< Self >;
   using ConstPointer = SmartPointer< const Self >;
 
   /** Run-time type information. */
-  itkTypeMacro( MeshToPolyDataFilter, ImageToImageFilter );
+  itkTypeMacro( MeshToPolyDataFilter, ProcessObject );
 
   /** Standard New macro. */
   itkNewMacro( Self );
 
+  /** Set the mesh input of this process object.  */
+  using Superclass::SetInput;
+  void SetInput(const InputMeshType *input);
+
+  /** Get the mesh input of this process object.  */
+  const InputMeshType * GetInput() const;
+
+  const InputMeshType * GetInput(unsigned int idx) const;
+
 protected:
   MeshToPolyDataFilter();
-  virtual ~MeshToPolyDataFilter() override {}
+  ~MeshToPolyDataFilter() override {}
 
   void PrintSelf( std::ostream& os, Indent indent ) const override;
 
-  typedef typename OutputImageType::RegionType OutputRegionType;
-
-  virtual void DynamicThreadedGenerateData( const OutputRegionType & outputRegion) override;
+  void GenerateData() override;
 
 private:
 
-
-#ifdef ITK_USE_CONCEPT_CHECKING
-  // Add concept checking such as
-  // itkConceptMacro( FloatingPointPixel, ( itk::Concept::IsFloatingPoint< typename InputImageType::PixelType > ) );
-#endif
 };
 }
 

include/itkMeshToPolyDataFilter.hxx

@@ -20,45 +20,60 @@
 
 #include "itkMeshToPolyDataFilter.h"
 
-#include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
-
 namespace itk
 {
 
-template< typename TInputImage, typename TOutputImage >
-MeshToPolyDataFilter< TInputImage, TOutputImage >
+template< typename TInputMesh >
+MeshToPolyDataFilter< TInputMesh >
 ::MeshToPolyDataFilter()
 {
+  // Modify superclass default values, can be overridden by subclasses
+  this->SetNumberOfRequiredInputs(1);
 }
 
 
-template< typename TInputImage, typename TOutputImage >
+template< typename TInputMesh >
 void
-MeshToPolyDataFilter< TInputImage, TOutputImage >
+MeshToPolyDataFilter< TInputMesh >
 ::PrintSelf( std::ostream& os, Indent indent ) const
 {
   Superclass::PrintSelf( os, indent );
 }
 
 
-template< typename TInputImage, typename TOutputImage >
+template< typename TInputMesh >
 void
-MeshToPolyDataFilter< TInputImage, TOutputImage >
-::DynamicThreadedGenerateData( const OutputRegionType & outputRegion)
+MeshToPolyDataFilter< TInputMesh >
+::SetInput(const TInputMesh *input)
+{
+  // Process object is not const-correct so the const_cast is required here
+  this->ProcessObject::SetNthInput( 0, const_cast< TInputMesh * >( input ) );
+}
+
+
+template< typename TInputMesh >
+const typename MeshToPolyDataFilter< TInputMesh >::InputMeshType *
+MeshToPolyDataFilter< TInputMesh >
+::GetInput() const
+{
+  return itkDynamicCastInDebugMode< const TInputMesh * >( this->GetPrimaryInput() );
+}
+
+
+template< typename TInputMesh >
+const typename MeshToPolyDataFilter< TInputMesh >::InputMeshType *
+MeshToPolyDataFilter< TInputMesh >
+::GetInput(unsigned int idx) const
 {
-  OutputImageType * output = this->GetOutput();
-  const InputImageType * input = this->GetInput();
-  using InputRegionType = typename InputImageType::RegionType;
-  InputRegionType inputRegion = InputRegionType(outputRegion.GetSize());
+  return dynamic_cast< const TInputMesh * > ( this->ProcessObject::GetInput(idx) );
+}
 
-  itk::ImageRegionConstIterator<InputImageType> in(input, inputRegion);
-  itk::ImageRegionIterator<OutputImageType> out(output, outputRegion);
 
-  for (in.GoToBegin(), out.GoToBegin(); !in.IsAtEnd() && !out.IsAtEnd(); ++in, ++out)
-  {
-    out.Set( in.Get() );
-  }
+template< typename TInputMesh >
+void
+MeshToPolyDataFilter< TInputMesh >
+::GenerateData()
+{
 }
 
 } // end namespace itk

itk-module.cmake

@@ -18,6 +18,7 @@ itk_module(MeshToPolyData
     ITKMesh
   TEST_DEPENDS
     ITKTestKernel
+    ITKIOMeshVTK
   DESCRIPTION
     "${DOCUMENTATION}"
   EXCLUDE_FROM_DEFAULT

setup.py

@@ -44,6 +44,6 @@
     keywords='ITK InsightToolkit',
     url=r'https://itk.org/',
     install_requires=[
-        r'itk'
+        r'itk>=5.0rc1'
     ]
     )

test/CMakeLists.txt

@@ -10,4 +10,5 @@ itk_add_test(NAME itkMeshToPolyDataFilterTest
   COMMAND MeshToPolyDataTestDriver
   itkMeshToPolyDataFilterTest
     DATA{Input/cow.vtk}
+    ${ITK_TEST_OUTPUT_DIR}/itkMeshToPolyDataFilterTest.vtk
   )

test/itkMeshToPolyDataFilterTest.cxx

@@ -19,7 +19,8 @@
 #include "itkMeshToPolyDataFilter.h"
 
 #include "itkCommand.h"
-#include "itkImageFileWriter.h"
+#include "itkMeshFileReader.h"
+#include "itkMesh.h"
 #include "itkTestingMacros.h"
 
 namespace{
@@ -51,45 +52,54 @@ class ShowProgress : public itk::Command
 };
 }
 
+
 int itkMeshToPolyDataFilterTest( int argc, char * argv[] )
 {
-  if( argc < 2 )
+  if( argc < 3 )
     {
     std::cerr << "Usage: " << argv[0];
-    std::cerr << " outputImage";
+    std::cerr << " inputMesh outputPolyData";
     std::cerr << std::endl;
     return EXIT_FAILURE;
     }
-  const char * outputImageFileName  = argv[1];
+  const char * inputMeshFileName = argv[1];
+  const char * outputPolyDataFileName = argv[1];
 
-  const unsigned int Dimension = 2;
+  const unsigned int Dimension = 3;
   using PixelType = float;
-  using ImageType = itk::Image< PixelType, Dimension >;
+  using MeshType = itk::Mesh< PixelType, Dimension >;
+
+  using MeshReaderType = itk::MeshFileReader< MeshType >;
+  MeshReaderType::Pointer meshReader = MeshReaderType::New();
+  meshReader->SetFileName( inputMeshFileName );
+  meshReader->Update();
 
-  using FilterType = itk::MeshToPolyDataFilter< ImageType, ImageType >;
+  using FilterType = itk::MeshToPolyDataFilter< MeshType >;
   FilterType::Pointer filter = FilterType::New();
 
-  EXERCISE_BASIC_OBJECT_METHODS( filter, MeshToPolyDataFilter, ImageToImageFilter );
+  EXERCISE_BASIC_OBJECT_METHODS( filter, MeshToPolyDataFilter, ProcessObject );
+
+  filter->SetInput( meshReader->GetOutput() );
 
-  // Create input image to avoid test dependencies.
-  ImageType::SizeType size;
-  size.Fill( 128 );
-  ImageType::Pointer image = ImageType::New();
-  image->SetRegions( size );
-  image->Allocate();
-  image->FillBuffer(1.1f);
+  //// Create input image to avoid test dependencies.
+  //ImageType::SizeType size;
+  //size.Fill( 128 );
+  //ImageType::Pointer image = ImageType::New();
+  //image->SetRegions( size );
+  //image->Allocate();
+  //image->FillBuffer(1.1f);
 
-  ShowProgress::Pointer showProgress = ShowProgress::New();
-  filter->AddObserver( itk::ProgressEvent(), showProgress );
-  filter->SetInput(image);
+  //ShowProgress::Pointer showProgress = ShowProgress::New();
+  //filter->AddObserver( itk::ProgressEvent(), showProgress );
+  //filter->SetInput(image);
 
-  typedef itk::ImageFileWriter< ImageType > WriterType;
-  WriterType::Pointer writer = WriterType::New();
-  writer->SetFileName( outputImageFileName );
-  writer->SetInput( filter->GetOutput() );
-  writer->SetUseCompression(true);
+  //typedef itk::ImageFileWriter< ImageType > WriterType;
+  //WriterType::Pointer writer = WriterType::New();
+  //writer->SetFileName( outputImageFileName );
+  //writer->SetInput( filter->GetOutput() );
+  //writer->SetUseCompression(true);
 
-  TRY_EXPECT_NO_EXCEPTION( writer->Update() );
+  TRY_EXPECT_NO_EXCEPTION( filter->Update() );
 
 
   return EXIT_SUCCESS;

wrapping/itkMeshToPolyDataFilter.wrap

@@ -1,4 +1,11 @@
+itk_wrap_include("itkMesh.h")
+itk_wrap_include("itkDefaultStaticMeshTraits.h")
+
 itk_wrap_class("itk::MeshToPolyDataFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2)
+  UNIQUE(types "${WRAP_ITK_SCALAR};D")
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    foreach(t ${types})
+      itk_wrap_template("M${ITKM_${t}}${d}" "itk::Mesh< ${ITKT_${t}},${d} >")
+    endforeach()
+  endforeach()
 itk_end_wrap_class()
-