X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FImage.h;h=30bfbf549cb1b725d32cc86063ae46b09d47649a;hb=00b54bc0344d74f31df8b93f7c28a07cfc8d6873;hp=e6b2b7762708360c5781af9651fe1f6ffc91212d;hpb=1adce86c283e253ec41f762652bc477d56d617a5;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index e6b2b77..30bfbf5 100644
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,14 +1,11 @@
 #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
 {
   namespace Interface
@@ -19,34 +16,44 @@ namespace cpPlugins
       : public DataObject
     {
     public:
-      typedef Image      Self;
-      typedef DataObject Superclass;
+      typedef Image                           Self;
+      typedef DataObject                      Superclass;
+      typedef itk::SmartPointer< Self >       Pointer;
+      typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
-      Image( );
-      virtual ~Image( );
+      itkNewMacro( Self );
+      itkTypeMacro( Image, DataObject );
+      cpPlugins_Id_Macro( Image, "DataObject" );
 
-      virtual std::string GetClassName( ) const;
-      virtual void SetDataObject( itk::DataObject* dobj );
+    public:
+      template< class I >
+        inline void SetITK( itk::Object* object );
 
-      vtkImageData* GetVTKImageData( ) const;
+      virtual void SetVTK( vtkObject* image );
 
     protected:
-      template< unsigned int D >
-      void _ConnectToVTK_0( );
+      Image( );
+      virtual ~Image( );
 
       template< class P, unsigned int D >
-      void _ConnectToVTK_1( );
+        inline void _ITK_2_VTK( itk::Object* object );
+
+    private:
+      // Purposely not implemented
+      Image( const Self& );
+      Self& operator=( const Self& );
 
     protected:
-      itk::ProcessObject::Pointer m_Image2VTKImageData;
-      vtkImageData* m_VTKImageData;
+      itk::ProcessObject::Pointer m_ITKvVTKConnection;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Image.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__IMAGE__H__
 
 // eof - $RCSfile$