X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkVtkBlackBoxMacros.h;h=ce87d7e37c2ccc56472c16322767a65d7283360a;hb=2c72a4807a6dd861fc034cd8cc6f3580679ef926;hp=6453a7070f63f4b6fa45eaada4f0c437f8614aee;hpb=db2adec4da5413691b7430ee1fa2354b9e53d312;p=bbtk.git

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 6453a70..ce87d7e 100644
--- 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/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
-  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: 2009/02/27 11:20:25 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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,7 @@
  */
 #ifndef __bbtkVtkBlackBoxMacros_h__
 #define __bbtkVtkBlackBoxMacros_h__
-//#include <vtkGarbageCollector.h>
+#include <vtkGarbageCollector.h>
 //#include <vtkObjectFactory.h>
 #include <vtkDebugLeaks.h>
 
@@ -34,11 +47,48 @@
 //===========================================================================
 //===========================================================================
 
+//===========================================================================
+#define BBTK_VTK_DISABLE_GARBAGE_COLLECTOR				\
+  public:								\
+  virtual void Register(vtkObjectBase* o) {}				\
+  virtual void UnRegister(vtkObjectBase* o) {}				\
+  protected:								\
+  virtual void ReportReferences(vtkGarbageCollector* collector) {}
+
+/*
+	
+  public:				   \
+  virtual void Register(vtkObjectBase* o) {} \
+     {
+     this->RegisterInternal(o, 1);
+     }
+   virtual void UnRegister(vtkObjectBase* o)
+     {
+     this->UnRegisterInternal(o, 1);
+     }
+
+  protected:
+
+   virtual void ReportReferences(vtkGarbageCollector* collector)
+     {
+     // Report references held by this object that may be in a loop.
+     this->Superclass::ReportReferences(collector);
+     vtkGarbageCollectorReport(collector, this->OtherObject, "Other Object");
+     }
+*/
+//===========================================================================
 
 //===========================================================================
 #define BBTK_VTK_DELETE()						\
   void bbDelete() {							\
+    for (int i=0; i<vtkParent::GetNumberOfInputPorts();++i)		\
+      vtkParent::SetInput(i,0);						\
     bbGetOutputOut()->SetSource(NULL);					\
+    /*std::cout << "VTK : bbDelete() "<<std::endl;*/			\
+    /*std::cout << "Use count = "<<GetUseCount()<<std::endl;*/		\
+    /*std::cout << "VTK count = "<<GetReferenceCount()<<std::endl;*/	\
+    /*    vtkParent::SetReferenceCount(1); GetUseCount());*/		\
+    /*delete this;	*/						\
     vtkParent::Delete();						\
   }
 
@@ -49,7 +99,7 @@
 #define BBTK_VTK_NEW(CLASS,VTKPARENT)					\
   inline static Pointer New(const std::string& name)			\
   {									\
-    vtkDebugLeaks::ConstructClass(#VTKPARENT);				\
+    /*vtkDebugLeaks::ConstructClass(#VTKPARENT);*/			\
     bbtkDebugMessage("object",1,"##> "<<#CLASS				\
 		     <<"::New(\""<<name<<"\")"<<std::endl);		\
     Pointer p = MakeBlackBoxPointer(new Self(name));			\
@@ -63,14 +113,14 @@
 #define BBTK_VTK_CLONE(CLASS,VTKPARENT)					\
   inline bbtk::BlackBox::Pointer bbClone(const std::string& name)	\
   {									\
-    vtkDebugLeaks::ConstructClass(#VTKPARENT);				\
+    /*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;								\
-  }									\
+  }									
 
 
 //===========================================================================
@@ -80,9 +130,15 @@
   BBTK_VTK_DELETE();							\
   public :								\
   BBTK_VTK_NEW(CLASS,VTKPARENT);					\
-  BBTK_VTK_CLONE(CLASS,VTKPARENT);							
+  BBTK_VTK_CLONE(CLASS,VTKPARENT);					
+
+//  BBTK_VTK_DISABLE_GARBAGE_COLLECTOR
 //===========================================================================
 
+#define BBTK_VTK_UNREGISTER(O) 
+
+//O->UnRegister(this);
+
 //===========================================================================
 /// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input 
 #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)		\
@@ -91,7 +147,7 @@
   { return GetImageDataInput(0); /*vtkParent::GetInput();*/ }		\
   void bbSetInput##NAME (TYPE d)					\
   { vtkParent::SetInput( (vtkDataObject*) d);				\
-    /*bbSetModifiedStatus();*/ }				
+    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }				
 //===========================================================================
 
 //===========================================================================
@@ -102,7 +158,7 @@
   { return GetPolyDataInput(0); /*vtkParent::GetInput();*/ }		\
   void bbSetInput##NAME (TYPE d)					\
   { vtkParent::SetInput( (vtkDataObject*) d);				\
-    /*bbSetModifiedStatus();*/ }						       
+    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }						       
 //===========================================================================
 
 //===========================================================================
@@ -122,7 +178,8 @@
   TYPE bbGetInput##NAME ()						\
   { return dynamic_cast<TYPE>(vtkParent::GetInput()); }			\
   void bbSetInput##NAME (TYPE d)					\
-  { vtkParent::SetInput( (vtkDataObject*) d); /*vtkParent::GetOutput() = d;*/ }
+  { vtkParent::SetInput( (vtkDataObject*) d);				\
+   BBTK_VTK_UNREGISTER(d);/*vtkParent::GetOutput() = d;*/ }
 
 //===========================================================================