X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FImage.h;h=729acdf682aaaa382d4e50db41ab40dadda85666;hb=1b600247da314fe62d007ca8a0ce24d0006931f4;hp=04d9507a1e1107bca513819c4fdd125cba8df400;hpb=9015cf98c60cf4ab304a639990004ee783a8bec0;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index 04d9507..729acdf 100644
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,15 +1,12 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGE__H__
 #define __CPPLUGINS__INTERFACE__IMAGE__H__
 
-#include <map>
-#include <string>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-#define ITK_MANUAL_INSTANTIATION
 #include <itkProcessObject.h>
 
-class vtkImageData;
+// Some forward declarations
+class vtkObject;
 
 namespace cpPlugins
 {
@@ -29,23 +26,20 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Image, DataObject );
+      cpPlugins_Id_Macro( Image, DataObject );
 
     public:
-      virtual void SetITKDataObject( itk::DataObject* o );
-      virtual void SetVTKDataObject( vtkDataObject* o );
+      template< class I >
+        inline void SetITK( itk::Object* object );
 
-      virtual vtkImageData* GetVTKImageData( );
-      virtual const vtkImageData* GetVTKImageData( ) const;
+      virtual void SetVTK( vtkObject* image );
 
     protected:
       Image( );
       virtual ~Image( );
 
-      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 );
+        inline void _ITK_2_VTK( itk::Object* object );
 
     private:
       // Purposely not implemented
@@ -60,6 +54,8 @@ namespace cpPlugins
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Image.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__IMAGE__H__
 
 // eof - $RCSfile$