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 0eb76ed4cbe8cfc96dc99057e7bbb462df63b56d..4d1f8fd3494a0146cb1b92398a578d66d373c5ce 100644 (file)
--- a/lib/cpPlugins/Interface/Mesh.h
+++ b/lib/cpPlugins/Interface/Mesh.h
@@ -1,12 +1,10 @@
 #ifndef __CPPLUGINS__INTERFACE__MESH__H__
 #define __CPPLUGINS__INTERFACE__MESH__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-#include <vtkSmartPointer.h>
-#include <vtkActor.h>
-#include <vtkPolyDataMapper.h>
+// Some forward declarations
+class vtkObject;
 
 namespace cpPlugins
 {
@@ -26,32 +24,23 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Mesh, DataObject );
-      cpPlugins_Id_Macro(
-        cpPlugins::Interface::Mesh, "DataObject"
-        );
+      cpPlugins_Id_Macro( Mesh, DataObject );
 
     public:
-      template< class M >
-        inline void SetITK( itk::Object* object );
-
-      virtual void SetVTK( vtkObject* mesh );
-
-      virtual void CreateVTKActor( );
-      virtual vtkActor* GetVTKActor( );
-      virtual const vtkActor* GetVTKActor( ) const;
+      virtual void SetITK( itk::LightObject* o );
+      virtual void SetVTK( vtkObjectBase* o );
 
     protected:
       Mesh( );
       virtual ~Mesh( );
 
+      template< class M >
+        inline void _ITK_2_VTK( itk::LightObject* o );
+
     private:
       // Purposely not implemented
       Mesh( const Self& );
       Self& operator=( const Self& );
-
-    protected:
-      vtkSmartPointer< vtkActor >          m_Actor;
-      vtkSmartPointer< vtkPolyDataMapper > m_Mapper;
     };
 
   } // ecapseman