Coding style improved.

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

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index a354da2d22aed395f86e4601a9b0b572a1c53948..a5beda39b58b59c7e3424a435f1cdbb9c1cafb7a 100644 (file)
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,26 +1,13 @@
 #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;
 
-// -------------------------------------------------------------------------
-#define cpPlugins_Image_Demangle( p, d, o, f, r )               \
-  if( dynamic_cast< itk::Image< p, d >* >( o ) != NULL )        \
-    r = this->f< itk::Image< p, d > >( o )
-
-// -------------------------------------------------------------------------
-#define cpPlugins_Image_Array_Demangle( a, p, da, di, o, f, r )    \
-  if( dynamic_cast< itk::Image< a< p, da >, di >* >( o ) != NULL ) \
-    r = this->f< itk::Image< a< p, da >, di > >( o )
-
 // -------------------------------------------------------------------------
 namespace cpPlugins
 {
@@ -42,9 +29,16 @@ namespace cpPlugins
       itkTypeMacro( Image, DataObject );
 
     public:
-      virtual void SetITKDataObject( itk::DataObject* o );
-      virtual void SetVTKDataObject( vtkDataObject* o );
+      template< class I >
+        inline void SetITKImage( itk::DataObject* object );
+
+      template< class I >
+        inline I* GetITKImage( );
+
+      template< class I >
+        inline const I* GetITKImage( ) const;
 
+      virtual void SetVTKImageData( vtkImageData* image );
       virtual vtkImageData* GetVTKImageData( );
       virtual const vtkImageData* GetVTKImageData( ) const;
 
@@ -52,11 +46,8 @@ namespace cpPlugins
       Image( );
       virtual ~Image( );
 
-      template< unsigned int D >
-        bool _Dim( itk::DataObject* o );
-
-      template< class I >
-        bool _Type( itk::DataObject* o );
+      template< class P, unsigned int D >
+        inline void _ITK_2_VTK( itk::DataObject* object );
 
     private:
       // Purposely not implemented
@@ -71,6 +62,8 @@ namespace cpPlugins
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Image.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__IMAGE__H__
 
 // eof - $RCSfile$