X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FImage.h;h=88808c4a59c7e360ece328eb27a23fc050356b9c;hb=a89305e04527ebe2e81d0d1a62bbe34e0d35a141;hp=4ba14cbf558fc80964f610acf9b2b0df393f47ec;hpb=cb833d2fface96e020fe91584d2206860a8174ee;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index 4ba14cb..88808c4 100644
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,13 +1,9 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGE__H__
 #define __CPPLUGINS__INTERFACE__IMAGE__H__
 
-#include <map>
-#include <string>
-#include <itkProcessObject.h>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-class vtkImageData;
+#include <itkProcessObject.h>
 
 namespace cpPlugins
 {
@@ -27,23 +23,24 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Image, DataObject );
+      cpPlugins_Id_Macro( Image, DataObject );
 
     public:
-      virtual std::string GetClassName( ) const;
-      virtual void SetRealDataObject( itk::DataObject* dobj );
-
-      vtkImageData* GetVTKImageData( ) const;
-      void UpdateVTKImageData( );
+      virtual void SetITK( itk::LightObject* o );
+      virtual void SetVTK( vtkObjectBase* o );
 
     protected:
       Image( );
       virtual ~Image( );
 
       template< unsigned int D >
-        void _VTK_0( );
+        inline bool _ITK_2_VTK_0( itk::LightObject* o );
 
       template< class P, unsigned int D >
-        void _VTK_1( );
+        inline bool _ITK_2_VTK_1( itk::LightObject* o );
+
+      template< class I >
+        inline bool _ITK_2_VTK_2( itk::LightObject* o );
 
     private:
       // Purposely not implemented
@@ -51,14 +48,15 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::ProcessObject::Pointer m_Image2VTKImageData;
-      vtkImageData* m_VTKImageData;
+      itk::ProcessObject::Pointer m_ITKvVTK;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Image.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__IMAGE__H__
 
 // eof - $RCSfile$