X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkVtkBlackBoxMacros.h;h=6453a7070f63f4b6fa45eaada4f0c437f8614aee;hb=436130ef5084e737c29470409da795832ed2129b;hp=560e304b4998e9d14841cb8991fb4974c5691c46;hpb=551b02f0819a98e9595a81570b1d1174f398f34d;p=bbtk.git

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 560e304..6453a70 100644
--- a/kernel/src/bbtkVtkBlackBoxMacros.h
+++ b/kernel/src/bbtkVtkBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkVtkBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/05/09 10:39:46 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/07/29 07:31:13 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,9 @@
  */
 #ifndef __bbtkVtkBlackBoxMacros_h__
 #define __bbtkVtkBlackBoxMacros_h__
-#include <vtkGarbageCollector.h>
+//#include <vtkGarbageCollector.h>
+//#include <vtkObjectFactory.h>
+#include <vtkDebugLeaks.h>
 
 
 //===========================================================================
@@ -40,13 +42,48 @@
     vtkParent::Delete();						\
   }
 
-//    bbmDescriptorPointer.reset();					\
+//    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 +91,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();*/ }		\