bug install on windows

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

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 4a16b6ea697dfb8bd4ab1eb89a845c3bdd8f3bf4..448e2fe23744974f8c23f0a932efbf2242c09922 100644 (file)
--- a/kernel/src/bbtkVtkBlackBoxMacros.h
+++ b/kernel/src/bbtkVtkBlackBoxMacros.h
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkVtkBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/07/23 12:02:15 $
-  Version:   $Revision: 1.5 $
-                                                                                
-  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/10/17 08:18:14 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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 
@@ -23,7 +36,9 @@
  */
 #ifndef __bbtkVtkBlackBoxMacros_h__
 #define __bbtkVtkBlackBoxMacros_h__
-#include <vtkGarbageCollector.h>
+//#include <vtkGarbageCollector.h>
+//#include <vtkObjectFactory.h>
+#include <vtkDebugLeaks.h>
 
 
 //===========================================================================
@@ -41,12 +56,47 @@
   }
 
 //    bbmDescriptorPointer.reset();            
+//===========================================================================
 
+//===========================================================================
+#define BBTK_VTK_NEW(CLASS,VTKPARENT)                                  \
+  inline static Pointer New(const std::string& name)                   \
+  {                                                                    \
+    vtkDebugLeaks::ConstructClass(#VTKPARENT);                         \
+    bbtkDebugMessage("object",1,"##> "<<#CLASS                         \
+                    <<"::New(\""<<name<<"\")"<<std::endl);             \
+    Pointer p = MakeBlackBoxPointer(new Self(name));                   \
+    bbtkDebugMessage("object",1,"<## "<<#CLASS                         \
+                    <<"::New(\""<<name<<"\")"<<std::endl);             \
+    return p;                                                          \
+  }                                                                    \
+//===========================================================================
+
+//===========================================================================
+#define BBTK_VTK_CLONE(CLASS,VTKPARENT)                                        \
+  inline bbtk::BlackBox::Pointer bbClone(const std::string& name)      \
+  {                                                                    \
+    vtkDebugLeaks::ConstructClass(#VTKPARENT);                         \
+    bbtkDebugMessage("object",1,"##> "<<#CLASS                         \
+                    <<"::bbClone(\""<<name<<"\")"<<std::endl);         \
+    Pointer p = MakeBlackBoxPointer(new Self(*this,name));             \
+    bbtkDebugMessage("object",1,"<## "<<#CLASS                         \
+                    <<"::bbClone(\""<<name<<"\")"<<std::endl);         \
+    return p;                                                          \
+  }                                                                    \
+
+
+//===========================================================================
 #define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKPARENT)   \
-  BBTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX);                      \
+  BBTK_BLACK_BOX_INTERFACE_WITHOUT_NEW(CLASS,PARENTBLACKBOX);          \
   typedef VTKPARENT vtkParent;                                         \
-  BBTK_VTK_DELETE();
+  BBTK_VTK_DELETE();                                                   \
+  public :                                                             \
+  BBTK_VTK_NEW(CLASS,VTKPARENT);                                       \
+  BBTK_VTK_CLONE(CLASS,VTKPARENT);                                                     
+//===========================================================================
 
+//===========================================================================
 /// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input 
 #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)              \
   public:                                                              \
@@ -54,10 +104,12 @@
   { return GetImageDataInput(0); /*vtkParent::GetInput();*/ }          \
   void bbSetInput##NAME (TYPE d)                                       \
   { vtkParent::SetInput( (vtkDataObject*) d);                          \
-    /*bbSetModifiedStatus();*/ }                                                      
+    /*bbSetModifiedStatus();*/ }                               
+//===========================================================================
+
 //===========================================================================
 /// Declares a vtkPolyDataAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)  \
+#define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)          \
   public:                                                              \
   TYPE bbGetInput##NAME ()                                             \
   { return GetPolyDataInput(0); /*vtkParent::GetInput();*/ }           \