OpenGL binary images visualization finished.

[cpPlugins.git] / lib / cpExtensions / Visualization / MPRActors.cxx

diff --git a/lib/cpExtensions/Visualization/MPRActors.cxx b/lib/cpExtensions/Visualization/MPRActors.cxx
index c0e8333860f020e5d661335b5c12d01a7e66c352..b04194484b71dcbaf4b3d2eb670cf308b480f82a 100644 (file)
--- a/lib/cpExtensions/Visualization/MPRActors.cxx
+++ b/lib/cpExtensions/Visualization/MPRActors.cxx
@@ -35,7 +35,7 @@ AddInputConnection( vtkAlgorithmOutput* aout )
   {
     for( unsigned int j = 0; j < 3; ++j )
     {
-      this->Slices[ i ][ j ]->AddInputConnection( aout );
+      this->Slices[ i ][ j ]->SetInputConnection( aout );
       this->Slices[ i ][ j ]->SetAxis( j );
 
     } // rof
@@ -53,7 +53,7 @@ AddInputData( vtkImageData* new_image )
   {
     for( unsigned int j = 0; j < 3; ++j )
     {
-      this->Slices[ i ][ j ]->AddInputData( new_image );
+      this->Slices[ i ][ j ]->SetInputImage( new_image );
       this->Slices[ i ][ j ]->SetAxis( j );
 
     } // rof
@@ -67,13 +67,7 @@ AddInputData( vtkImageData* new_image )
 unsigned int cpExtensions::Visualization::MPRActors::
 GetNumberOfImages( ) const
 {
-  /* TODO
-     ImageBlender* blender = this->Slices[ 0 ][ 0 ]->GetBlender( );
-     if( blender != NULL )
-     return( blender->GetNumberOfImages( ) );
-     else
-  */
-  return( 0 );
+  return( this->Slices[ 0 ][ 0 ]->GetNumberOfImages( ) );
 }
 
 // -------------------------------------------------------------------------
@@ -90,35 +84,8 @@ PushActorsInto(
   this->Slices[ 1 ][ 1 ]->PushActorsInto( w, false );
   this->Slices[ 1 ][ 2 ]->PushActorsInto( w, false );
 
-  vtkRenderer* xren =
-    ( x != NULL )? x->GetRenderers( )->GetFirstRenderer( ): NULL;
-  vtkRenderer* yren =
-    ( y != NULL )? y->GetRenderers( )->GetFirstRenderer( ): NULL;
-  vtkRenderer* zren =
-    ( z != NULL )? z->GetRenderers( )->GetFirstRenderer( ): NULL;
   vtkRenderer* wren =
     ( w != NULL )? w->GetRenderers( )->GetFirstRenderer( ): NULL;
-
-  /* TODO
-     if( xren != NULL )
-     {
-     xren->AddActor( this->Slices[ 0 ][ 1 ]->GetPlaneActor( ) );
-     xren->AddActor( this->Slices[ 0 ][ 2 ]->GetPlaneActor( ) );
-
-     } // fi
-     if( yren != NULL )
-     {
-     yren->AddActor( this->Slices[ 0 ][ 0 ]->GetPlaneActor( ) );
-     yren->AddActor( this->Slices[ 0 ][ 2 ]->GetPlaneActor( ) );
-
-     } // fi
-     if( zren != NULL )
-     {
-     zren->AddActor( this->Slices[ 0 ][ 0 ]->GetPlaneActor( ) );
-     zren->AddActor( this->Slices[ 0 ][ 1 ]->GetPlaneActor( ) );
-
-     } // fi
-  */
   if( wren != NULL )
     wren->AddActor( this->ImageOutlineActor );
 }