Merge ssh://git.creatis.insa-lyon.fr/cpPlugins

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

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index 04d9507a1e1107bca513819c4fdd125cba8df400..1aeee5cc18a7b6945951fcbf7d692d1748318b70 100644 (file)
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,16 +1,14 @@
 #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;
 
+// -------------------------------------------------------------------------
 namespace cpPlugins
 {
   namespace Interface
@@ -29,23 +27,22 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Image, DataObject );
+      cpPlugins_Id_Macro(
+        cpPlugins::Interface::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 +57,8 @@ namespace cpPlugins
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Image.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__IMAGE__H__
 
 // eof - $RCSfile$