X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FMesh.h;h=4d1f8fd3494a0146cb1b92398a578d66d373c5ce;hb=6ffc11d77924d6ab7e94db95d41105982ac73e00;hp=241da35309cac492dfea071d86be5fa226af0407;hpb=cb833d2fface96e020fe91584d2206860a8174ee;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Mesh.h b/lib/cpPlugins/Interface/Mesh.h
index 241da35..4d1f8fd 100644
--- a/lib/cpPlugins/Interface/Mesh.h
+++ b/lib/cpPlugins/Interface/Mesh.h
@@ -1,13 +1,10 @@
 #ifndef __CPPLUGINS__INTERFACE__MESH__H__
 #define __CPPLUGINS__INTERFACE__MESH__H__
 
-#include <map>
-#include <string>
-#include <itkProcessObject.h>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-class vtkMapper;
+// Some forward declarations
+class vtkObject;
 
 namespace cpPlugins
 {
@@ -27,37 +24,31 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Mesh, DataObject );
+      cpPlugins_Id_Macro( Mesh, DataObject );
 
     public:
-      virtual std::string GetClassName( ) const;
-      virtual void SetRealDataObject( itk::DataObject* dobj );
-
-      vtkMapper* GetVTKMapper( ) const;
+      virtual void SetITK( itk::LightObject* o );
+      virtual void SetVTK( vtkObjectBase* o );
 
     protected:
       Mesh( );
       virtual ~Mesh( );
 
       template< class M >
-        void _Map( );
+        inline void _ITK_2_VTK( itk::LightObject* o );
 
     private:
       // Purposely not implemented
       Mesh( const Self& );
       Self& operator=( const Self& );
-
-    protected:
-      /*
-        itk::ProcessObject::Pointer m_Mesh2VTKMeshData;
-        vtkMeshData* m_VTKMeshData;
-      */
-      vtkMapper* m_Mapper;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Mesh.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__MESH__H__
 
 // eof - $RCSfile$