...

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

diff --git a/lib/cpPlugins/Interface/Image.cxx b/lib/cpPlugins/Interface/Image.cxx
index d309a1120473af6ef85ab97cd85004bba6e6c908..c72663d5dbda9f65cb3cc2eddf021e64b4796fa3 100644 (file)
--- a/lib/cpPlugins/Interface/Image.cxx
+++ b/lib/cpPlugins/Interface/Image.cxx
@@ -6,98 +6,109 @@
 #include <itkImageToVTKImageFilter.h>
 
 // -------------------------------------------------------------------------
-#define cpPlugins_Interface_Image_Dimension( d, dobj, func )            \
-  if( dynamic_cast< itk::ImageBase< d >* >( dobj ) != NULL )            \
-    this->func< d >( )
+#define cpPlugins_Image_Dimension( d, o, f )                         \
+  if( dynamic_cast< itk::ImageBase< d >* >( o ) != NULL )            \
+    this->f< d >( )
 
 // -------------------------------------------------------------------------
-#define cpPlugins_Interface_Image_Pixel( p, d, dobj, func )             \
-  if( dynamic_cast< itk::Image< p, d >* >( dobj ) != NULL )             \
-    this->func< p, d >( )
+#define cpPlugins_Image_Pixel( p, d, o, f )                             \
+  if( dynamic_cast< itk::Image< p, d >* >( o ) != NULL )                \
+    this->f< p, d >( )
 
 // -------------------------------------------------------------------------
-#define cpPlugins_Interface_Image_RGB( p, d, dobj, func )               \
-  if( dynamic_cast< itk::Image< itk::RGBPixel< p >, d >* >( dobj ) != NULL ) \
-    this->func< itk::RGBPixel< p >, d >( )
+#define cpPlugins_Image_RGB( p, d, o, f )                               \
+  if(                                                                   \
+    dynamic_cast< itk::Image< itk::RGBPixel< p >, d >* >( o ) != NULL   \
+    )                                                                   \
+    this->f< itk::RGBPixel< p >, d >( )
 
 // -------------------------------------------------------------------------
-cpPlugins::Interface::Image::
-Image( )
-  : Superclass( ),
-    m_VTKImageData( NULL )
+std::string cpPlugins::Interface::Image::
+GetClassName( ) const
 {
+  return( "cpPlugins::Interface::Image" );
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Interface::Image::
-~Image( )
+void cpPlugins::Interface::Image::
+SetRealDataObject( itk::DataObject* dobj )
 {
+  this->Superclass::SetRealDataObject( dobj );
+
+  // NOTE: Only 2 and 3 dimensions at this moment to connect with VTK
+  cpPlugins_Image_Dimension( 2, dobj, _VTK_0 );
+  else cpPlugins_Image_Dimension( 3, dobj, _VTK_0 );
 }
 
 // -------------------------------------------------------------------------
-std::string cpPlugins::Interface::Image::
-GetClassName( ) const
+vtkImageData* cpPlugins::Interface::Image::
+GetVTKImageData( ) const
 {
-  return( "cpPlugins::Interface::Image" );
+  return( this->m_VTKImageData );
 }
 
 // -------------------------------------------------------------------------
 void cpPlugins::Interface::Image::
-SetDataObject( itk::DataObject* dobj )
+UpdateVTKImageData( )
 {
-  this->Superclass::SetDataObject( dobj );
-  
-  // WARNING: Only 2 and 3 dimensions at this moment
-  cpPlugins_Interface_Image_Dimension( 2, dobj, _ConnectToVTK_0 );
-  else cpPlugins_Interface_Image_Dimension( 3, dobj, _ConnectToVTK_0 );
+  this->m_Image2VTKImageData->Modified( );
+  this->m_Image2VTKImageData->Update( );
+  this->m_VTKImageData->Modified( );
 }
 
 // -------------------------------------------------------------------------
-vtkImageData* cpPlugins::Interface::Image::
-GetVTKImageData( ) const
+cpPlugins::Interface::Image::
+Image( )
+  : Superclass( ),
+    m_VTKImageData( NULL )
+{
+}
+
+// -------------------------------------------------------------------------
+cpPlugins::Interface::Image::
+~Image( )
 {
-  return( this->m_VTKImageData );
 }
 
 // -------------------------------------------------------------------------
 template< unsigned int D >
 void cpPlugins::Interface::Image::
-_ConnectToVTK_0( )
+_VTK_0( )
 {
-  itk::DataObject* dobj = this->Superclass::GetDataObject( );
-
-  cpPlugins_Interface_Image_Pixel( char, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( short, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( int, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( long, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( unsigned char, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( unsigned short, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( unsigned int, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( unsigned long, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( float, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_Pixel( double, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( char, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( short, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( int, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( long, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( unsigned char, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( unsigned short, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( unsigned int, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( unsigned long, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( float, D, dobj, _ConnectToVTK_1 );
-  else cpPlugins_Interface_Image_RGB( double, D, dobj, _ConnectToVTK_1 );
+  itk::DataObject* dobj = this->Superclass::GetRealDataObject( );
+
+  cpPlugins_Image_Pixel( char, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( short, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( int, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( long, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( unsigned char, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( unsigned short, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( unsigned int, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( unsigned long, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( float, D, dobj, _VTK_1 );
+  else cpPlugins_Image_Pixel( double, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( char, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( short, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( int, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( long, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( unsigned char, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( unsigned short, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( unsigned int, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( unsigned long, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( float, D, dobj, _VTK_1 );
+  else cpPlugins_Image_RGB( double, D, dobj, _VTK_1 );
 }
 
 // -------------------------------------------------------------------------
 template< class P, unsigned int D >
 void cpPlugins::Interface::Image::
-_ConnectToVTK_1( )
+_VTK_1( )
 {
   typedef itk::Image< P, D > _TImage;
   typedef itk::ImageToVTKImageFilter< _TImage > _TFilter;
 
   _TImage* img =
-    dynamic_cast< _TImage* >( this->Superclass::GetDataObject( ) );
+    dynamic_cast< _TImage* >( this->Superclass::GetRealDataObject( ) );
   typename _TFilter::Pointer filter = _TFilter::New( );
   filter->SetInput( img );
   filter->Update( );