From: guigues <guigues>
Date: Tue, 6 May 2008 07:36:42 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~52
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=13304e56deca37fe54072b423bc1214687ec503a;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index 4aeb878..a315ed9 100644
--- a/kernel/appli/bbfy/bbfy.cpp
+++ b/kernel/appli/bbfy/bbfy.cpp
@@ -556,7 +556,7 @@ void bbfy::CreateHeader()
        (mType == vtkPolyDataAlgorithm) )
     {
       mFile << "  typedef " <<mVtkParent <<" vtkParent;"<<std::endl;
-      mFile << "  void bbDelete() { vtkParent::Delete(); }"<<std::endl;
+      mFile << "  BBTK_VTK_DELETE(vtkParent);"<<std::endl;
     }
   for (i=mTypedef.begin(); i!=mTypedef.end(); ++i) 
     {
diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index ff2d034..2162b4c 100644
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 10:24:58 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/05/06 07:36:42 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -826,7 +826,8 @@
     /*bbSetModifiedStatus();*/ }
 //===========================================================================
 
-
+#define BBTK_VTK_DELETE(VTKPARENT)			\
+  void bbDelete() { VTKPARENT::Delete(); }
 
 //===========================================================================
 /// EOF
diff --git a/packages/vtk/src/bbvtkMarchingCubes.h b/packages/vtk/src/bbvtkMarchingCubes.h
index 6ad9555..c02ffb7 100644
--- a/packages/vtk/src/bbvtkMarchingCubes.h
+++ b/packages/vtk/src/bbvtkMarchingCubes.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkMarchingCubes.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/05/06 07:36:42 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,7 +68,8 @@ namespace bbvtk
     void DoProcess() { vtkMarchingCubes::Update(); }
 
     // Overload bbDelete to handle vtk reference counting
-    void bbDelete() { Delete(); }
+    BBTK_VTK_DELETE(vtkMarchingCubes);
+    //void bbDelete() { Delete(); }
   };
   //=======================================================================
   
diff --git a/packages/vtk/src/bbvtkMetaImageReader.xml b/packages/vtk/src/bbvtkMetaImageReader.xml
index 020ce3b..891912f 100644
--- a/packages/vtk/src/bbvtkMetaImageReader.xml
+++ b/packages/vtk/src/bbvtkMetaImageReader.xml
@@ -18,6 +18,13 @@
    Update();
  </PRE></process>
 
-</blackbox>
-
+/*   bbGetOutputOut()->SetSource(NULL);*/
+<serconstructor><PRE>
+std::cout << "$$$$$$ constructing $$$$$"<<std::endl; 
+</PRE></serconstructor>     
+<serdestructor><PRE>  
+std::cout << "$$$$$$ deleting $$$$$"<<std::endl; 
+</PRE></serdestructor>
+</blackbox>  
+