Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins

[cpPlugins.git] / lib / cpPlugins / Interface / Mesh.h

diff --git a/lib/cpPlugins/Interface/Mesh.h b/lib/cpPlugins/Interface/Mesh.h
index 11a52e8dae2a71bc04254c52e7bbc86403d3ec61..92c3c452e378fdd4598d0059855a0a616f4b6ba4 100644 (file)
--- a/lib/cpPlugins/Interface/Mesh.h
+++ b/lib/cpPlugins/Interface/Mesh.h
@@ -4,8 +4,6 @@
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-class vtkPolyData;
-
 namespace cpPlugins
 {
   namespace Interface
@@ -24,47 +22,20 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Mesh, DataObject );
+      cpPlugins_Id_Macro(
+        cpPlugins::Interface::Mesh, "DataObject"
+        );
 
     public:
       template< class M >
-        inline void SetITKMesh( itk::DataObject* object );
-
-      template< class M >
-        inline M* GetITKMesh( );
-
-      template< class M >
-        inline const M* GetITKMesh( ) const;
-
-      virtual void SetVTKMesh( vtkPolyData* mesh );
-      virtual vtkPolyData* GetVTKMesh( );
-      virtual const vtkPolyData* GetVTKMesh( ) const;
+        inline void SetITK( itk::Object* object );
 
-      /* TODO
-         virtual void SetITKDataObject( itk::DataObject* o );
-         virtual void SetVTKDataObject( vtkDataObject* o );
-
-         vtkPolyData* GetVTKPolyData( );
-         const vtkPolyData* GetVTKPolyData( ) const;
-      */
+      virtual void SetVTK( vtkObject* mesh );
 
     protected:
       Mesh( );
       virtual ~Mesh( );
 
-      /* TODO
-         template< unsigned int D >
-         void _ITK_2_VTK_0( itk::DataObject* o );
-
-         template< class P, unsigned int D >
-         void _ITK_2_VTK_1( itk::DataObject* o );
-
-         template< unsigned int D >
-         void _VTK_2_ITK_0( itk::DataObject* o );
-
-         template< class P, unsigned int D >
-         void _VTK_2_ITK_1( itk::DataObject* o );
-      */
-
     private:
       // Purposely not implemented
       Mesh( const Self& );