X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FMesh.h;h=75c5eb3683e766a6a546e3091330116d170a8b2e;hb=75dc4945344b4a5a7be10a3ca33fa2e6fff87df8;hp=ae7292891d2b1cfccb226a596f9c7bff1b1459eb;hpb=2361f4f97631e09d88d8a5510a369817dcaa19db;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Mesh.h b/lib/cpPlugins/Interface/Mesh.h
index ae72928..75c5eb3 100644
--- a/lib/cpPlugins/Interface/Mesh.h
+++ b/lib/cpPlugins/Interface/Mesh.h
@@ -1,10 +1,13 @@
 #ifndef __CPPLUGINS__INTERFACE__MESH__H__
 #define __CPPLUGINS__INTERFACE__MESH__H__
 
-#include <cpPlugins/cpPlugins_Export.h>
+#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-class vtkPolyData;
+#include <vtkSmartPointer.h>
+#include <vtkActor.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
 
 namespace cpPlugins
 {
@@ -12,7 +15,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_EXPORT Mesh
+    class cpPlugins_Interface_EXPORT Mesh
       : public DataObject
     {
     public:
@@ -26,38 +29,41 @@ namespace cpPlugins
       itkTypeMacro( Mesh, DataObject );
 
     public:
-      virtual void SetITKDataObject( itk::DataObject* o );
-      virtual void SetVTKDataObject( vtkDataObject* o );
+      template< class M >
+        inline void SetITKMesh( itk::DataObject* object );
 
-      vtkPolyData* GetVTKPolyData( );
-      const vtkPolyData* GetVTKPolyData( ) const;
+      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;
+      virtual vtkActor* GetVTKActor( );
+      virtual const vtkActor* GetVTKActor( ) const;
 
     protected:
       Mesh( );
       virtual ~Mesh( );
 
-      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& );
       Self& operator=( const Self& );
+
+    protected:
+      vtkSmartPointer< vtkActor >          m_Actor;
+      vtkSmartPointer< vtkPolyDataMapper > m_Mapper;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Mesh.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__MESH__H__
 
 // eof - $RCSfile$