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 75c5eb3683e766a6a546e3091330116d170a8b2e..92c3c452e378fdd4598d0059855a0a616f4b6ba4 100644 (file)
--- a/lib/cpPlugins/Interface/Mesh.h
+++ b/lib/cpPlugins/Interface/Mesh.h
@@ -4,11 +4,6 @@
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-#include <vtkSmartPointer.h>
-#include <vtkActor.h>
-#include <vtkPolyData.h>
-#include <vtkPolyDataMapper.h>
-
 namespace cpPlugins
 {
   namespace Interface
@@ -27,22 +22,15 @@ 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( );
+        inline void SetITK( itk::Object* object );
 
-      template< class M >
-        inline const M* GetITKMesh( ) const;
-
-      virtual void SetVTKMesh( vtkPolyData* mesh );
-      virtual vtkPolyData* GetVTKMesh( );
-      virtual const vtkPolyData* GetVTKMesh( ) const;
-      virtual vtkActor* GetVTKActor( );
-      virtual const vtkActor* GetVTKActor( ) const;
+      virtual void SetVTK( vtkObject* mesh );
 
     protected:
       Mesh( );
@@ -52,10 +40,6 @@ namespace cpPlugins
       // Purposely not implemented
       Mesh( const Self& );
       Self& operator=( const Self& );
-
-    protected:
-      vtkSmartPointer< vtkActor >          m_Actor;
-      vtkSmartPointer< vtkPolyDataMapper > m_Mapper;
     };
 
   } // ecapseman