X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FProcessObject.h;h=a9779282c8a59e37973504e1ec04730a4bf2a5ae;hb=aa6a578004bddb5b0bb07b780483fda0ecc6cb5e;hp=44864926d572c2f52cfff8d6a16d030d085ff391;hpb=b007dfbd638db86c5e8da53299da58f4c9d9e8b8;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/ProcessObject.h b/lib/cpPlugins/Interface/ProcessObject.h
index 4486492..a977928 100644
--- a/lib/cpPlugins/Interface/ProcessObject.h
+++ b/lib/cpPlugins/Interface/ProcessObject.h
@@ -1,38 +1,35 @@
 #ifndef __CPPLUGINS__INTERFACE__PROCESSOBJECT__H__
 #define __CPPLUGINS__INTERFACE__PROCESSOBJECT__H__
 
-#include <map>
-#include <string>
-#include <itkDataObject.h>
+#include <itkProcessObject.h>
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/Object.h>
 #include <cpPlugins/Interface/DataObject.h>
+#include <cpPlugins/Interface/Parameters.h>
 
 namespace cpPlugins
 {
   namespace Interface
   {
-    class DataObject;
-
     /**
      */
     class cpPlugins_Interface_EXPORT ProcessObject
       : public Object
     {
     public:
-      typedef ProcessObject Self;
-      typedef Object        Superclass;
-
-      typedef std::pair< std::string, std::string > TParameter;
-      typedef std::map< std::string, TParameter >   TParameters;
+      typedef ProcessObject                   Self;
+      typedef Object                          Superclass;
+      typedef itk::SmartPointer< Self >       Pointer;
+      typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
-      ProcessObject( );
-      virtual ~ProcessObject( );
+      itkTypeMacro( ProcessObject, Object );
 
+    public:
       virtual std::string GetClassName( ) const;
-      virtual const TParameters& GetDefaultParameters( ) const;
-      virtual void SetParameters( const TParameters& params );
+      virtual std::string GetClassType( ) const;
+      virtual const Parameters& GetDefaultParameters( ) const;
+      virtual void SetParameters( const Parameters& params );
 
       virtual unsigned int GetNumberOfInputs( ) const;
       virtual unsigned int GetNumberOfOutputs( ) const;
@@ -40,40 +37,42 @@ namespace cpPlugins
       virtual void SetNumberOfInputs( unsigned int n );
       virtual void SetNumberOfOutputs( unsigned int n );
 
-      virtual void SetInput( unsigned int idx, const DataObject* dobj );
+      virtual void SetInput( unsigned int idx, DataObject* dobj );
       virtual DataObject* GetOutput( unsigned int idx );
 
       virtual std::string Update( );
       virtual void DisconnectOutputs( );
 
     protected:
+      ProcessObject( );
+      virtual ~ProcessObject( );
+
       virtual itk::DataObject* _GetInput( unsigned int idx );
       virtual void _SetOutput( unsigned int idx, itk::DataObject* dobj );
-      virtual void _DeleteOutputs( );
 
       template< class O >
       void _MakeOutput( unsigned int idx )
         {
           if( idx >= this->m_Outputs.size( ) )
             return;
-        
-          if( !( this->m_OutputsDisconnected ) )
-            if( this->m_Outputs[ idx ] != NULL )
-              delete this->m_Outputs[ idx ];
-
-          this->m_Outputs[ idx ] = new O( );
+          this->m_Outputs[ idx ] = O::New( );
           this->m_Outputs[ idx ]->SetSource( this );
         }
 
       virtual std::string _GenerateData( ) = 0;
 
+    private:
+      // Purposely not implemented
+      ProcessObject( const Self& );
+      Self& operator=( const Self& );
+
     protected:
-      TParameters m_DefaultParameters;
-      TParameters m_Parameters;
+      itk::ProcessObject::Pointer m_RealProcessObject;
+      Parameters m_DefaultParameters;
+      Parameters m_Parameters;
 
-      std::vector< const DataObject* > m_Inputs;
-      std::vector< DataObject* >       m_Outputs;
-      bool m_OutputsDisconnected;
+      std::vector< DataObject::Pointer > m_Inputs;
+      std::vector< DataObject::Pointer > m_Outputs;
     };
 
   } // ecapseman