From: guigues <guigues>
Date: Wed, 7 May 2008 12:59:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~48
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a32025c531a0e20e967dc2ba3e0817f6932061b1;p=bbtk.git

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

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index bb42097..65b6c23 100644
--- a/kernel/appli/bbfy/bbfy.cpp
+++ b/kernel/appli/bbfy/bbfy.cpp
@@ -515,7 +515,6 @@ void bbfy::CreateHeader()
   // Class declaration and parents
   mFile << "class /*BBTK_EXPORT*/ "<<mName<<"\n";
   mFile << " : \n";
-  mFile << "   public "<<mParentBlackBox;
 
   /*
   if (mBB.nChildNode("inherits"))
@@ -535,18 +534,16 @@ void bbfy::CreateHeader()
 
   if (mType == itkImageToImageFilter )
     {
-      mFile << ",\n   public " << mItkParent <<"\n";
+      mFile << "   public " << mItkParent <<",\n";
     }
   else if ( (mType == vtkImageAlgorithm) ||
 	    (mType == vtkPolyDataAlgorithm) )
     {
-      mFile << ",\n   public " << mVtkParent <<"\n";
-    }
-  else 
-    {
-      mFile << "\n";
+      mFile << "   public " << mVtkParent <<",\n";
     }
 
+  mFile << "   public "<<mParentBlackBox << "\n";
+
   mFile << "{\n";
 
   // Interface
diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 51a9ab7..7b3c4a8 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/05/06 13:45:12 $
-Version:   $Revision: 1.17 $
+Date:      $Date: 2008/05/07 12:59:23 $
+Version:   $Revision: 1.18 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See doc/license.txt or
@@ -65,7 +65,7 @@ namespace bbtk
     bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : deleting black box"<<std::endl);
     
     b->bbDelete();
-    
+
     bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : releasing descriptor ["<<desc.lock()<<"]"<<std::endl);
     
     if (!desc.expired()) 
diff --git a/kernel/src/bbtkItkBlackBoxMacros.h b/kernel/src/bbtkItkBlackBoxMacros.h
index 2894465..3cb6d16 100644
--- a/kernel/src/bbtkItkBlackBoxMacros.h
+++ b/kernel/src/bbtkItkBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkItkBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/05/07 07:26:50 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/05/07 12:59:23 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,7 +32,8 @@
 //===========================================================================
 #define BBTK_ITK_DELETE()						\
   void bbDelete() {							\
-    itkParent::UnRegister(); }
+    itkParent::UnRegister();						\
+  }
 //===========================================================================
 
 //===========================================================================
diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 7f5f0d7..bc2400f 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/07 07:26:50 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/05/07 12:59:23 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,6 +23,8 @@
  */
 #ifndef __bbtkVtkBlackBoxMacros_h__
 #define __bbtkVtkBlackBoxMacros_h__
+#include <vtkGarbageCollector.h>
+
 
 //===========================================================================
 //============================================================================
@@ -34,7 +36,11 @@
 //===========================================================================
 #define BBTK_VTK_DELETE()						\
   void bbDelete() {							\
-    vtkParent::Delete(); }
+    bbGetOutputOut()->SetSource(NULL);					\
+    /*    vtkParent::SetReferenceCount(0);*/				\
+    bbmDescriptorPointer.reset();					\
+    vtkParent::Delete();						\
+  }
 
 #define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKPARENT)	\
   BBTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX);			\
@@ -107,7 +113,6 @@
     bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()	\
 		     <<"]"<<std::endl);					\
     vtkParent::Update();						\
-    bbGetOutputOut()->SetSource(NULL);					\
     bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()	\
 		     <<"]"<<std::endl);					\
   }
diff --git a/packages/vtk/src/bbvtkMetaImageReader.xml b/packages/vtk/src/bbvtkMetaImageReader.xml
index 7d33af4..a557719 100644
--- a/packages/vtk/src/bbvtkMetaImageReader.xml
+++ b/packages/vtk/src/bbvtkMetaImageReader.xml
@@ -19,7 +19,7 @@
    // We need to disconnect the output image from its source or the 
    // vtk object will not be deleted as it 
    // will be referenced by its output image
-   bbGetOutputOut()->SetSource(NULL);					
+//   bbGetOutputOut()->SetSource(NULL);					
  </PRE></process>
 
 </blackbox>  
diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 4f05719..b81a1dd 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:53 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/05/07 12:59:23 $
+  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
@@ -120,6 +120,10 @@ namespace bbwxvtk
     bbSetInputIn4(NULL);
     bbSetInputIn5(NULL);
     bbSetInputObs1(NULL);
+    bbSetInputObs2(NULL);
+    bbSetInputObs3(NULL);
+    bbSetInputObs4(NULL);
+    bbSetInputObs5(NULL);
     bbSetOutputRenderer( NULL );
     bbSetOutputInteractor( NULL );
   }