MAC compilation issues solved... Now some tests please

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

diff --git a/lib/cpPlugins/Interface/Mesh.h b/lib/cpPlugins/Interface/Mesh.h
index a1f06771b7410c41190b230f5899a7e8faddc30b..4d1f8fd3494a0146cb1b92398a578d66d373c5ce 100644 (file)
--- 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,33 +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:
-      vtkMapper* m_Mapper;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Mesh.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__MESH__H__
 
 // eof - $RCSfile$