X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBoxMacros.h;h=731ceed4518f5dc01b720e1cbc84d37a13de0628;hb=de86b2c1152e6932fd8d846702aa5a72b81ded5c;hp=aa70474fbb3b0f0682d9f5b98485c3fec7718e74;hpb=b8fe96fbebd153e92de1f1bfcad48ad009365df5;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index aa70474..731ceed 100644
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:33 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.20 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 
@@ -98,10 +105,10 @@
   }									\
   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;								\
   }									\
@@ -143,11 +150,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);				\
   }
 //============================================================================
 
@@ -203,8 +210,8 @@
 
 //============================================================================
 #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();						\
@@ -215,15 +222,15 @@
 
 //============================================================================
 #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();						\
@@ -233,9 +240,9 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)		\
-  bbtkDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS		\
-		   <<"("<<FROM.bbGetFullName()<<",\""			\
-		   <<bbGetName()<<"\")"<<std::endl);			\
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS	\
+			   <<"("<<FROM.bbGetFullName()			\
+			   <<")"<<std::endl);				\
   if (ALLOC)								\
     {									\
       bbCopyIOValues(FROM);						\
@@ -244,16 +251,17 @@
 
 //============================================================================
 #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);
 
 //============================================================================
 
@@ -279,7 +287,6 @@
   CLASS::~CLASS()							\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    CLASS::bbUserFinalizeProcessing();					\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   void CLASS::bbLockDescriptor() 					\
@@ -544,6 +551,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)		\
@@ -568,7 +578,6 @@
   CLASS<T>::~CLASS()							\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    CLASS<T>::bbFinalizeProcessing();					\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   template <class T>							\
@@ -743,7 +752,6 @@
   CLASS<T1,T2>::~CLASS()						\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    CLASS<T1,T2>::bbFinalizeProcessing();				\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   template <class T1, class T2>						\