X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FDataObject.h;h=e2d79ffcc16ba3313d4b50b2b1e4e7f26759a60e;hb=1b600247da314fe62d007ca8a0ce24d0006931f4;hp=46682197b81eee9b3bae03f355965dec90b18e20;hpb=5c1b2267b487286b208c71a6bdeb7ed5b5ccc370;p=cpPlugins.git diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h index 4668219..e2d79ff 100644 --- a/lib/cpPlugins/Interface/DataObject.h +++ b/lib/cpPlugins/Interface/DataObject.h @@ -3,10 +3,6 @@ #include -#include -#include -#include - namespace cpPlugins { namespace Interface @@ -26,8 +22,9 @@ namespace cpPlugins typedef itk::SmartPointer< const Self > ConstPointer; public: + itkNewMacro( Self ); itkTypeMacro( DataObject, Object ); - cpPlugins_Id_Macro( DataObject, "BasicObject" ); + cpPlugins_Id_Macro( DataObject, BasicObject ); public: ProcessObject* GetSource( ); @@ -36,18 +33,6 @@ namespace cpPlugins void DisconnectPipeline( ); - template< class T > - inline T* GetITK( ); - - template< class T > - inline const T* GetITK( ) const; - - template< class T > - inline T* GetVTK( ); - - template< class T > - inline const T* GetVTK( ) const; - protected: DataObject( ); virtual ~DataObject( ); @@ -58,17 +43,13 @@ namespace cpPlugins Self& operator=( const Self& ); protected: - itk::Object::Pointer m_ITKObject; - vtkSmartPointer< vtkObject > m_VTKObject; - ProcessObject* m_Source; + ProcessObject* m_Source; }; } // ecapseman } // ecapseman -#include - #endif // __CPPLUGINS__INTERFACE__DATAOBJECT__H__ // eof - $RCSfile$