New widget pipeline : progressing ...

[bbtk.git] / kernel / src / bbtkAtomicBlackBoxMacros.h

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index cdbf459ecae949a39f2e75d8a66ed1b1fc9e4b3f..69bcc7c5bbae88b923c4d0d4a2e9cc0b9fd23548 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/05/07 06:31:37 $
-  Version:   $Revision: 1.9 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/11/25 11:17:13 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 
 /**
  *  \file 
@@ -24,6 +37,28 @@
 #ifndef __bbtkAtomicBlackBoxMacros_h__
 #define __bbtkAtomicBlackBoxMacros_h__
 
+//============================================================================
+/// Declares the standard interface of a AtomicBlackBox 
+/// (ctor, New, descriptor related methods)
+#define BBTK_BLACK_BOX_INTERFACE_INTERNAL_WITHOUT_NEW(CLASS,PARENT)    \
+  BBTK_OBJECT_MINIMAL_INTERFACE;                               \
+  private:                                                             \
+  protected:                                                           \
+  CLASS(const std::string& name, bool allocate_connectors = true);     \
+  CLASS(Self& from, const std::string& name,                           \
+       bool allocate_connectors = true);                               \
+  ~CLASS();                                                            \
+  public:                                                              \
+  std::string GetObjectName() const                                    \
+  { return std::string(#CLASS)+std::string(" '")                       \
+      +bbGetNameWithParent()+std::string("'"); }                       \
+  virtual void bbLockDescriptor();                                     \
+  private:                                                             \
+  CLASS() : PARENT("") {}                                              \
+  CLASS(const CLASS&) : PARENT("") {}                                  
+
+//============================================================================
+
 //============================================================================
 /// Declares the standard interface of a AtomicBlackBox 
 /// (ctor, New, descriptor related methods)
@@ -70,6 +105,12 @@
   BBTK_BLACK_BOX_INTERFACE_INTERNAL(CLASS,PARENT);
 //============================================================================
 
+//============================================================================
+#define BBTK_BLACK_BOX_INTERFACE_WITHOUT_NEW(CLASS,PARENT)     \
+  public : typedef CLASS Self;                         \
+  BBTK_BLACK_BOX_INTERFACE_INTERNAL_WITHOUT_NEW(CLASS,PARENT);
+//============================================================================
+
 //============================================================================
 /// Defines the bbUserProcess method
 #define BBTK_PROCESS(CALLBACK)                                         \
@@ -79,7 +120,7 @@
     bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()   \
                     <<"]"<<std::endl);                                 \
     CALLBACK();                                                                \
-    bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()   \
+    bbtkDebugMessage("process",1,"<** Processing ["<<bbGetFullName()   \
                     <<"]"<<std::endl);                                 \
   }
 //============================================================================
@@ -200,7 +241,7 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    CLASS::bbUserCopyConstructor();                                    \
+    CLASS::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>()); \
     BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
   }                                                                    \
   CLASS::~CLASS()                                                      \
@@ -483,7 +524,7 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    CLASS<T>::bbUserCopyConstructor();                                 \
+    CLASS<T>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>()); \
     BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
   }                                                                    \
   template <class T>                                                   \
@@ -658,7 +699,7 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    CLASS<T1,T2>::bbUserCopyConstructor();                             \
+    CLASS<T1,T2>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());        \
     BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
   }                                                                    \
   template <class T1, class T2>                                                \