X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FDataObject.h;h=05b70239dc06bda7ff7ac5e7451bbca89f050b95;hb=de874ea850042e77a99a456188f423c8df2e374f;hp=cc8d8bfe60a66ce81cfce5f54d988a45f06b5912;hpb=2361f4f97631e09d88d8a5510a369817dcaa19db;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h
index cc8d8bf..05b7023 100644
--- a/lib/cpPlugins/Interface/DataObject.h
+++ b/lib/cpPlugins/Interface/DataObject.h
@@ -1,23 +1,22 @@
 #ifndef __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 #define __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 
-#include <map>
-#include <string>
-#include <vtkDataObject.h>
-#include <vtkSmartPointer.h>
-#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/Object.h>
 
-#define ITK_MANUAL_INSTANTIATION
-#include <itkDataObject.h>
+#include <itkObject.h>
+#include <vtkSmartPointer.h>
+#include <vtkObject.h>
 
 namespace cpPlugins
 {
   namespace Interface
   {
+    // Some forward declarations
+    class ProcessObject;
+
     /**
      */
-    class cpPlugins_EXPORT DataObject
+    class cpPlugins_Interface_EXPORT DataObject
       : public Object
     {
     public:
@@ -27,22 +26,28 @@ namespace cpPlugins
       typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
+      itkNewMacro( Self );
       itkTypeMacro( DataObject, Object );
+      cpPlugins_Id_Macro( DataObject, BasicObject );
 
     public:
-      virtual itk::DataObject* GetITKDataObject( );
-      virtual const itk::DataObject* GetITKDataObject( ) const;
-      virtual void SetITKDataObject( itk::DataObject* o ) = 0;
+      ProcessObject* GetSource( );
+      const ProcessObject* GetSource( ) const;
+      void SetSource( ProcessObject* src );
+
+      void DisconnectPipeline( );
 
-      virtual vtkDataObject* GetVTKDataObject( );
-      virtual const vtkDataObject* GetVTKDataObject( ) const;
-      virtual void SetVTKDataObject( vtkDataObject* o ) = 0;
+      template< class T >
+        inline T* GetITK( );
 
-      Object* GetSource( );
-      const Object* GetSource( ) const;
-      void SetSource( Object* src );
+      template< class T >
+        inline const T* GetITK( ) const;
 
-      void DisconnectPipeline( );
+      template< class T >
+        inline T* GetVTK( );
+
+      template< class T >
+        inline const T* GetVTK( ) const;
 
     protected:
       DataObject( );
@@ -54,15 +59,17 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::DataObject::Pointer         m_ITKObject;
-      vtkSmartPointer< vtkDataObject > m_VTKObject;
-      Object::Pointer                  m_Source;
+      itk::Object::Pointer         m_ITKObject;
+      vtkSmartPointer< vtkObject > m_VTKObject;
+      ProcessObject*               m_Source;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#include <cpPlugins/Interface/DataObject.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 
 // eof - $RCSfile$