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 805b8a1d66b76d158b4b84fe5df002cb5bb66693..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
 {
@@ -19,34 +16,39 @@ namespace cpPlugins
       : public DataObject
     {
     public:
-      typedef Mesh       Self;
-      typedef DataObject Superclass;
+      typedef Mesh                            Self;
+      typedef DataObject                      Superclass;
+      typedef itk::SmartPointer< Self >       Pointer;
+      typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
-      Mesh( );
-      virtual ~Mesh( );
-
-      virtual std::string GetClassName( ) const;
-      virtual void SetDataObject( itk::DataObject* dobj );
+      itkNewMacro( Self );
+      itkTypeMacro( Mesh, DataObject );
+      cpPlugins_Id_Macro( Mesh, DataObject );
 
-      vtkMapper* GetVTKMapper( ) const;
+    public:
+      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 );
 
-    protected:
-      /*
-        itk::ProcessObject::Pointer m_Mesh2VTKMeshData;
-        vtkMeshData* m_VTKMeshData;
-      */
-      vtkMapper* m_Mapper;
+    private:
+      // Purposely not implemented
+      Mesh( const Self& );
+      Self& operator=( const Self& );
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Mesh.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__MESH__H__
 
 // eof - $RCSfile$