X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FProcessObject.cxx;h=364816a4d094ae5c2df701dec48228ecc929ae05;hb=6226e722a440b16cd35bb126353f6a14ff86bccf;hp=0f8f2885bfb9b9aac979ade6093decb6006b4b1c;hpb=e18f55af541dba9026284beb6f12ef06b12e6f47;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/ProcessObject.cxx b/lib/cpPlugins/Interface/ProcessObject.cxx
index 0f8f288..364816a 100644
--- a/lib/cpPlugins/Interface/ProcessObject.cxx
+++ b/lib/cpPlugins/Interface/ProcessObject.cxx
@@ -1,19 +1,30 @@
 #include <cpPlugins/Interface/ProcessObject.h>
+#include <itkProcessObject.h>
+
+#ifdef cpPlugins_Interface_QT4
+#include <QApplication>
+#include <cpPlugins/Interface/ParametersQtDialog.h>
+#include <cpPlugins/Interface/SimpleMPRWidget.h>
+#endif // cpPlugins_Interface_QT4
 
 // -------------------------------------------------------------------------
-const cpPlugins::Interface::Parameters&
-cpPlugins::Interface::ProcessObject::
-GetDefaultParameters( ) const
+std::set< std::string > cpPlugins::Interface::ProcessObject::
+GetInputsNames( ) const
 {
-  return( this->m_DefaultParameters );
+  std::set< std::string > names;
+  for( auto i = this->m_Inputs.begin( ); i != this->m_Inputs.end( ); ++i )
+    names.insert( i->first );
+  return( names );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Interface::ProcessObject::
-SetParameters( const cpPlugins::Interface::Parameters& params )
+std::set< std::string > cpPlugins::Interface::ProcessObject::
+GetOutputsNames( ) const
 {
-  this->m_Parameters = params;
-  this->Modified( );
+  std::set< std::string > names;
+  for( auto i = this->m_Outputs.begin( ); i != this->m_Outputs.end( ); ++i )
+    names.insert( i->first );
+  return( names );
 }
 
 // -------------------------------------------------------------------------
@@ -30,44 +41,90 @@ GetNumberOfOutputs( ) const
   return( this->m_Outputs.size( ) );
 }
 
+// -------------------------------------------------------------------------
+cpPlugins::Interface::
+OutputProcessObjectPort& cpPlugins::Interface::ProcessObject::
+GetOutput( const std::string& id )
+{
+  static OutputProcessObjectPort null_port;
+  auto i = this->m_Outputs.find( id );
+  if( i == this->m_Outputs.end( ) )
+  {
+    null_port = NULL;
+    return( null_port );
+  }
+  else
+    return( i->second );
+}
+
+// -------------------------------------------------------------------------
+const cpPlugins::Interface::
+OutputProcessObjectPort& cpPlugins::Interface::ProcessObject::
+GetOutput( const std::string& id ) const
+{
+  static const OutputProcessObjectPort null_port;
+  auto i = this->m_Outputs.find( id );
+  if( i == this->m_Outputs.end( ) )
+    return( null_port );
+  else
+    return( i->second );
+}
+
+// -------------------------------------------------------------------------
+bool cpPlugins::Interface::ProcessObject::
+SetInput( const std::string& id, const OutputProcessObjectPort& port )
+{
+  auto i = this->m_Inputs.find( id );
+  if( i != this->m_Inputs.end( ) )
+  {
+    if( i->second.GetPointer( ) != port.GetPointer( ) )
+    {
+      i->second = port;
+      this->Modified( );
+
+    } // fi
+    return( true );
+  }
+  else
+    return( false );
+}
+
 // -------------------------------------------------------------------------
 void cpPlugins::Interface::ProcessObject::
-SetNumberOfInputs( unsigned int n )
+DisconnectInputs( )
 {
-  this->m_Inputs.clear( );
-  this->m_Inputs.resize( n );
+  auto i = this->m_Inputs.begin( );
+  for( ; i != this->m_Inputs.end( ); ++i )
+    i->second = NULL;
   this->Modified( );
 }
 
 // -------------------------------------------------------------------------
 void cpPlugins::Interface::ProcessObject::
-SetNumberOfOutputs( unsigned int n )
+DisconnectOutputs( )
 {
-  this->m_Outputs.clear( );
-  this->m_Outputs.resize( n );
+  auto i = this->m_Outputs.begin( );
+  for( ; i != this->m_Outputs.end( ); ++i )
+    if( i->second.IsValid( ) )
+      i->second->DisconnectFromPipeline( );
   this->Modified( );
 }
 
 // -------------------------------------------------------------------------
 void cpPlugins::Interface::ProcessObject::
-SetInput( unsigned int idx, cpPlugins::Interface::DataObject* dobj )
+Disconnect( )
 {
-  if( idx < this->m_Inputs.size( ) )
-  {
-    this->m_Inputs[ idx ] = dobj;
-    this->Modified( );
-
-  } // fi
+  this->DisconnectInputs( );
+  this->DisconnectOutputs( );
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Interface::DataObject* cpPlugins::Interface::ProcessObject::
-GetOutput( unsigned int idx )
+itk::ModifiedTimeType cpPlugins::Interface::ProcessObject::
+GetMTime( ) const
 {
-  if( idx < this->m_Outputs.size( ) )
-    return( this->m_Outputs[ idx ] );
-  else
-    return( NULL );
+  auto params_time = this->m_Parameters->GetMTime( );
+  auto filter_time = this->Superclass::GetMTime( );
+  return( ( params_time < filter_time )? params_time: filter_time );
 }
 
 // -------------------------------------------------------------------------
@@ -77,44 +134,83 @@ Update( )
   std::string r = "";
 
   // Force upstream updates
-  for( unsigned int i = 0; i < this->m_Inputs.size( ) && r == ""; ++i )
+  auto i = this->m_Inputs.begin( );
+  bool need_to_update = false;
+  for( ; i != this->m_Inputs.end( ) && r == ""; ++i )
   {
-    Self* src = dynamic_cast< Self* >( this->m_Inputs[ i ]->GetSource( ) );
-    if( src != NULL )
-      r = src->Update( );
+    if( i->second.IsValid( ) )
+    {
+      Self* src = dynamic_cast< Self* >( i->second->GetSource( ) );
+      if( src != NULL )
+      {
+        need_to_update |= ( this->m_LastExecutionTime < src->GetMTime( ) );
+        r = src->Update( );
+
+      } // fi
+
+    } // fi
 
   } // rof
 
   // Current update
   if( r == "" )
-    r = this->_GenerateData( );
+  {
+    if( this->m_LastExecutionTime < this->GetMTime( ) || need_to_update )
+    {
+      r = this->_GenerateData( );
+      this->m_LastExecutionTime = this->GetMTime( );
+
+    } // fi
+
+  } // fi
 
   // Return error description, if any
   return( r );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Interface::ProcessObject::
-DisconnectOutputs( )
+cpPlugins::Interface::ProcessObject::
+ProcessObject( )
+  : Superclass( ),
+    m_LastExecutionTime( 0 ),
+    m_ParametersDialog( NULL ),
+    m_MPRViewer( NULL )
 {
-  for( unsigned int idx = 0; idx < this->m_Outputs.size( ); ++idx )
-    if( this->m_Outputs[ idx ].IsNotNull( ) )
-      this->m_Outputs[ idx ]->DisconnectPipeline( );
+  this->m_Parameters = TParameters::New( );
+  this->m_Parameters->SetProcessObject( this );
+
+#ifdef cpPlugins_Interface_QT4
+  if( QApplication::instance( ) != NULL )
+  {
+    this->m_ParametersDialog = new ParametersQtDialog( );
+    this->m_ParametersDialog->setParameters( this->m_Parameters );
+
+  } // fi
+#endif // cpPlugins_Interface_QT4
 }
 
 // -------------------------------------------------------------------------
 cpPlugins::Interface::ProcessObject::
-ProcessObject( )
-  : Superclass( )
+~ProcessObject( )
 {
-  this->m_ClassName = "cpPlugins::Interface::ProcessObject";
-  this->m_ClassCategory = "BasicObject";
+  this->Disconnect( );
+  if( this->m_ParametersDialog != NULL )
+    delete this->m_ParametersDialog;
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Interface::ProcessObject::
-~ProcessObject( )
+void cpPlugins::Interface::ProcessObject::
+_AddInput( const std::string& name, bool required )
 {
+//  typedef typename _TInputs::value_type _TValue;
+  auto i = this->m_Inputs.find( name );
+  if( i == this->m_Inputs.end( ) )
+  {
+    InputProcessObjectPort new_port( required );
+    this->m_Inputs[ name ] = new_port;
+    this->Modified( );
+
+  } // fi
 }
 
 // eof - $RCSfile$