Major refactoring: API-HCI bug corrected.

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

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index 4ba14cbf558fc80964f610acf9b2b0df393f47ec..04d9507a1e1107bca513819c4fdd125cba8df400 100644 (file)
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -3,10 +3,12 @@
 
 #include <map>
 #include <string>
-#include <itkProcessObject.h>
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
+#define ITK_MANUAL_INSTANTIATION
+#include <itkProcessObject.h>
+
 class vtkImageData;
 
 namespace cpPlugins
@@ -29,21 +31,21 @@ namespace cpPlugins
       itkTypeMacro( Image, DataObject );
 
     public:
-      virtual std::string GetClassName( ) const;
-      virtual void SetRealDataObject( itk::DataObject* dobj );
+      virtual void SetITKDataObject( itk::DataObject* o );
+      virtual void SetVTKDataObject( vtkDataObject* o );
 
-      vtkImageData* GetVTKImageData( ) const;
-      void UpdateVTKImageData( );
+      virtual vtkImageData* GetVTKImageData( );
+      virtual const vtkImageData* GetVTKImageData( ) const;
 
     protected:
       Image( );
       virtual ~Image( );
 
       template< unsigned int D >
-        void _VTK_0( );
+        void _ITK_2_VTK_0( itk::DataObject* o );
 
       template< class P, unsigned int D >
-        void _VTK_1( );
+        void _ITK_2_VTK_1( itk::DataObject* o );
 
     private:
       // Purposely not implemented
@@ -51,8 +53,7 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::ProcessObject::Pointer m_Image2VTKImageData;
-      vtkImageData* m_VTKImageData;
+      itk::ProcessObject::Pointer m_ITKvVTKConnection;
     };
 
   } // ecapseman