X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBoxMacros.h;h=17e1c05369619f7103aacceec0b68f65c70b4798;hb=bafc00d3eee5ab3c580e0971cb2d8806b5c74f35;hp=9bc56ad02c3d59b53d957fe7adcfc962f93700b1;hpb=edd3ac38162ff897429cc7af71557dc54e7d5efe;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index 9bc56ad..17e1c05 100644
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/30 14:31:30 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2009/06/10 11:36:51 $
+  Version:   $Revision: 1.19 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -53,13 +53,18 @@
   { return std::string(#CLASS)+std::string(" '")			\
       +bbGetNameWithParent()+std::string("'"); }			\
   virtual void bbLockDescriptor();					\
-  virtual void bbConstructor() {					\
-    PARENT::bbConstructor();						\
-    CLASS::bbUserConstructor();						\
+  virtual void bbUserSetDefaultValues();				\
+  virtual void bbUserInitializeProcessing();				\
+  virtual void bbUserFinalizeProcessing();				\
+  virtual void bbRecursiveInitializeProcessing()			\
+  {									\
+    PARENT::bbRecursiveInitializeProcessing();				\
+    CLASS::bbUserInitializeProcessing();				\
   }									\
-  virtual void bbDestructor() {						\
-    PARENT::bbDestructor();						\
-    CLASS::bbUserDestructor();						\
+  virtual void bbRecursiveFinalizeProcessing()				\
+  {									\
+    CLASS::bbUserFinalizeProcessing();					\
+    PARENT::bbRecursiveFinalizeProcessing();				\
   }									\
   private:								\
   CLASS() : PARENT("") {}						\
@@ -93,21 +98,26 @@
   }									\
   inline bbtk::BlackBox::Pointer bbClone(const std::string& name)	\
   {									\
-    bbtkDebugMessage("object",1,"##> "<<#CLASS				\
-		     <<"::bbClone(\""<<name<<"\")"<<std::endl);		\
+    bbtkBlackBoxDebugMessage("object",1,"##> "<<#CLASS			\
+			     <<"::bbClone(\""<<name<<"\")"<<std::endl);	\
     Pointer p = MakeBlackBoxPointer(new Self(*this,name));		\
-    bbtkDebugMessage("object",1,"<## "<<#CLASS				\
+    bbtkBlackBoxDebugMessage("object",1,"<## "<<#CLASS			\
 		     <<"::bbClone(\""<<name<<"\")"<<std::endl);		\
     return p;								\
   }									\
   virtual void bbLockDescriptor();					\
-  virtual void bbConstructor() {					\
-    PARENT::bbConstructor();						\
-    CLASS::bbUserConstructor();						\
+  virtual void bbUserSetDefaultValues();				\
+  virtual void bbUserInitializeProcessing();				\
+  virtual void bbUserFinalizeProcessing();				\
+  virtual void bbRecursiveInitializeProcessing()			\
+  {									\
+    PARENT::bbRecursiveInitializeProcessing();				\
+    CLASS::bbUserInitializeProcessing();				\
   }									\
-  virtual void bbDestructor() {						\
-    PARENT::bbDestructor();						\
-    CLASS::bbUserDestructor();						\
+  virtual void bbRecursiveFinalizeProcessing()				\
+  {									\
+    CLASS::bbUserFinalizeProcessing();					\
+    PARENT::bbRecursiveFinalizeProcessing();				\
   }									\
   private:								\
   CLASS() : PARENT("") {}						\
@@ -133,11 +143,11 @@
   public:								\
   inline void bbUserProcess()						\
   {									\
-    bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()	\
-		     <<"]"<<std::endl);					\
+    bbtkBlackBoxDebugMessage("process",1,"**> Processing..."		\
+			     <<std::endl);				\
     CALLBACK();								\
-    bbtkDebugMessage("process",1,"<** Processing ["<<bbGetFullName()	\
-		     <<"]"<<std::endl);					\
+    bbtkBlackBoxDebugMessage("process",1,"<** Processing"		\
+			     <<std::endl);				\
   }
 //============================================================================
 
@@ -193,51 +203,58 @@
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,ALLOC)			\
-  bbtkDebugMessage("object",2,"==> "<<#CLASS<<"::"<<#CLASS		\
-		   <<"(\""<<bbGetName()<<"\")"<<std::endl);		\
+  bbtkBlackBoxDebugMessage("object",2,"==> "<<#CLASS<<"::"<<#CLASS	\
+			   <<"()"<<std::endl);				\
   if (ALLOC)								\
     {									\
       bbLockDescriptor();						\
       bbAllocateConnectors();						\
-    }
+    }									
+
 //============================================================================
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS)				\
-  bbtkDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS		\
-		   <<"(\""<<bbGetName()<<"\")"<<std::endl);		
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS	\
+			   <<"()"<<std::endl);		
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)		\
-  bbtkDebugMessageInc("object",2,"==> "<<#CLASS<<"::"<<#CLASS		\
-		      <<"("<<FROM.bbGetFullName()<<",\""		\
-		      <<bbGetName()<<"\")"<<std::endl);			\
+  bbtkBlackBoxDebugMessage("object",2,"==> "<<#CLASS<<"::"<<#CLASS	\
+			   <<"("<<FROM.bbGetFullName()			\
+			   <<")"<<std::endl);				\
   if (ALLOC)								\
     {									\
       bbLockDescriptor();						\
       bbAllocateConnectors();						\
-      bbCopyIOValues(FROM);						\
-   }
+    }
 //============================================================================
 
 //============================================================================
-#define BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM)			\
-  bbtkDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS		\
-		   <<"("<<FROM.bbGetFullName()<<",\""			\
-		   <<bbGetName()<<"\")"<<std::endl);		
+#define BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)		\
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS	\
+			   <<"("<<FROM.bbGetFullName()			\
+			   <<")"<<std::endl);				\
+  if (ALLOC)								\
+    {									\
+      bbCopyIOValues(FROM);						\
+    }
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS)				\
-  bbtkDebugMessage("object",2,"==> "<<#CLASS <<"::~"<< #CLASS		\
-		   <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);
+  bbtkBlackBoxDebugMessage("object",2,"==> "<<#CLASS <<"::~"<< #CLASS	\
+			   <<"()"<<std::endl); \
+  bbFinalizeProcessing();						
+
+
 //============================================================================
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS)				\
-  bbtkDebugMessage("object",2,"<== "<<#CLASS <<"::~"<< #CLASS		\
-		   <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS <<"::~"<< #CLASS	\
+			   <<"()"<<std::endl);
 
 //============================================================================
 
@@ -249,7 +266,7 @@
     : PARENT(name,false)						\
   {									\
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,allocate_connectors);	\
-    /*CLASS::bbUserConstructor();	*/				\
+    CLASS::bbUserSetDefaultValues();						\
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);				\
   }									\
   CLASS::CLASS(CLASS& from,						\
@@ -257,13 +274,12 @@
     : PARENT(from,name,false)						\
   {									\
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    /*CLASS::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
-    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);			\
+    CLASS::bbUserSetDefaultValues();						\
+    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors);			\
   }									\
   CLASS::~CLASS()							\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    /*CLASS::bbUserDestructor();*/					\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   void CLASS::bbLockDescriptor() 					\
@@ -528,6 +544,9 @@
 		       (&CLASS<T>::bbSetOutput##NAME) ) )
 //============================================================================
 
+
+//JCP 09JUIN2009 BBTK_EXPORT
+
 //============================================================================
 /// Template AtomicBlackBox std implementation of ctor and dtor
 #define BBTK_BLACK_BOX_TEMPLATE_IMPLEMENTATION(CLASS,PARENT)		\
@@ -536,7 +555,7 @@
     : PARENT(name,false)						\
   {									\
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);			\
-    /*CLASS<T>::bbUserConstructor();*/					\
+    CLASS<T>::bbUserSetDefaultValues();					\
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);				\
   }									\
   template <class T>							\
@@ -545,14 +564,13 @@
     : PARENT(from,name,false)						\
   {									\
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    /*CLASS<T>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
-    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);			\
+    CLASS<T>::bbUserSetDefaultValues();					\
+    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors);			\
   }									\
   template <class T>							\
   CLASS<T>::~CLASS()							\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    /*CLASS<T>::bbUserDestructor();*/					\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   template <class T>							\
@@ -711,7 +729,7 @@
     : PARENT(name,false)						\
   {									\
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);			\
-    /*CLASS<T1,T2>::bbUserConstructor();*/				\
+    CLASS<T1,T2>::bbUserSetDefaultValues();				\
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);				\
   }									\
   template <class T1, class T2>						\
@@ -720,14 +738,13 @@
     : PARENT(from,name,false)						\
   {									\
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    /*CLASS<T1,T2>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
-    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);			\
+    CLASS<T1,T2>::bbUserSetDefaultValues();				\
+    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors);			\
   }									\
   template <class T1, class T2>						\
   CLASS<T1,T2>::~CLASS()						\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    /*CLASS<T1,T2>::bbUserDestructor();*/				\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   template <class T1, class T2>						\