MAC compilation issues solved... Now some tests please

[cpPlugins.git] / lib / cpPlugins / Interface / ProcessObject.hxx

diff --git a/lib/cpPlugins/Interface/ProcessObject.hxx b/lib/cpPlugins/Interface/ProcessObject.hxx
index 33b4a2022cb558bc9a943c4be8a8c4240038116d..54c2f37bb8ede077d0f7238dbf760f5ac3382ec3 100644 (file)
--- a/lib/cpPlugins/Interface/ProcessObject.hxx
+++ b/lib/cpPlugins/Interface/ProcessObject.hxx
@@ -4,9 +4,9 @@
 // -------------------------------------------------------------------------
 template< class T >
 T* cpPlugins::Interface::ProcessObject::
-GetInput( const std::string& id )
+GetInputData( const std::string& id )
 {
-  _TDataContainer::iterator i = this->m_Inputs.find( id );
+  auto i = this->m_Inputs.find( id );
   if( i != this->m_Inputs.end( ) )
     return( dynamic_cast< T* >( i->second.GetPointer( ) ) );
   else
@@ -16,9 +16,9 @@ GetInput( const std::string& id )
 // -------------------------------------------------------------------------
 template< class T >
 const T* cpPlugins::Interface::ProcessObject::
-GetInput( const std::string& id ) const
+GetInputData( const std::string& id ) const
 {
-  _TDataContainer::const_iterator i = this->m_Inputs.find( id );
+  auto i = this->m_Inputs.find( id );
   if( i != this->m_Inputs.end( ) )
     return( dynamic_cast< const T* >( i->second.GetPointer( ) ) );
   else
@@ -28,9 +28,9 @@ GetInput( const std::string& id ) const
 // -------------------------------------------------------------------------
 template< class T >
 T* cpPlugins::Interface::ProcessObject::
-GetOutput( const std::string& id )
+GetOutputData( const std::string& id )
 {
-  _TDataContainer::iterator i = this->m_Outputs.find( id );
+  auto i = this->m_Outputs.find( id );
   if( i != this->m_Outputs.end( ) )
     return( dynamic_cast< T* >( i->second.GetPointer( ) ) );
   else
@@ -40,9 +40,9 @@ GetOutput( const std::string& id )
 // -------------------------------------------------------------------------
 template< class T >
 const T* cpPlugins::Interface::ProcessObject::
-GetOutput( const std::string& id ) const
+GetOutputData( const std::string& id ) const
 {
-  _TDataContainer::const_iterator i = this->m_Outputs.find( id );
+  auto i = this->m_Outputs.find( id );
   if( i != this->m_Outputs.end( ) )
     return( dynamic_cast< const T* >( i->second.GetPointer( ) ) );
   else
@@ -52,11 +52,17 @@ GetOutput( const std::string& id ) const
 // -------------------------------------------------------------------------
 template< class O >
 void cpPlugins::Interface::ProcessObject::
-_AddOutput( const std::string& id )
+_AddOutput( const std::string& name )
 {
-  this->m_Outputs[ id ] = O::New( );
-  this->m_Outputs[ id ]->SetSource( this );
-  this->Modified( );
+  auto i = this->m_Outputs.find( name );
+  if( i == this->m_Outputs.end( ) )
+  {
+    typename O::Pointer o = O::New( );
+    o->SetSource( this );
+    this->m_Outputs[ name ] = o;
+    this->Modified( );
+
+  } // fi
 }
 
 // -------------------------------------------------------------------------
@@ -64,13 +70,14 @@ template< class F >
 F* cpPlugins::Interface::ProcessObject::
 _CreateITK( )
 {
-  F* filter = dynamic_cast< F* >( this->m_ITKObject.GetPointer( ) );
+  F* filter = this->GetITK< F >( );
   if( filter == NULL )
   {
-    typename F::Pointer ptr = F::New( );
-    this->m_ITKObject = ptr;
-    filter = ptr.GetPointer( );
+    typename F::Pointer filter_ptr = F::New( );
+    this->m_ITKObject = filter_ptr;
     this->m_VTKObject = NULL;
+    filter = filter_ptr.GetPointer( );
+    this->Modified( );
 
   } // fi
   return( filter );
@@ -81,12 +88,14 @@ template< class F >
 F* cpPlugins::Interface::ProcessObject::
 _CreateVTK( )
 {
-  F* filter = dynamic_cast< F* >( this->m_VTKObject.GetPointer( ) );
+  F* filter = this->GetVTK< F >( );
   if( filter == NULL )
   {
-    filter = F::New( );
-    this->m_VTKObject = filter;
+    vtkSmartPointer< F > filter_ptr = vtkSmartPointer< F >::New( );
     this->m_ITKObject = NULL;
+    this->m_VTKObject = filter_ptr;
+    filter = filter_ptr.GetPointer( );
+    this->Modified( );
 
   } // fi
   return( filter );