Fixed (sure ? to test extensively) the problem with vtk-inherited black boxes desallo...

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index a4dea22c8624d2e0959d574c573799a54122dd72..803e554ce0971f89ed7e21c73dfc2f5741a6fbea 100644 (file)
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/11 15:30:04 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2009/02/27 11:20:25 $
+  Version:   $Revision: 1.39 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -78,7 +78,7 @@ namespace bbtk
     
     b->bbDelete();
 
-    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : releasing descriptor ["<<desc.lock()<<"]"<<std::endl);
+    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : releasing descriptor"<<std::endl);
     
     if (!desc.expired()) 
       {

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 4d824a9f0c3221da727a2626074d17f6863fcae6..3ba655b7df333da5c150070e05388d6029e605fd 100644 (file)
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2009/02/27 11:20:25 $
+  Version:   $Revision: 1.41 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -324,11 +324,31 @@ namespace bbtk
   void Factory::CloseAllPackages()
   {
     bbtkDebugMessageInc("Kernel",7,"Factory::CloseAllPackages()"<<std::endl);
-    while (mPackageMap.begin() != mPackageMap.end())
-      {
-        PackageMapType::iterator i = mPackageMap.begin();
-        ClosePackage(i);
-      }
+    
+    std::vector< Package::WeakPointer > mAlive;  
+    do {
+      mAlive.clear();  
+      while (mPackageMap.begin() != mPackageMap.end())
+       {
+         PackageMapType::iterator i = mPackageMap.begin();
+         Package::WeakPointer p = i->second;
+         ClosePackage(i);
+         if (p.lock()) mAlive.push_back(p);
+       }
+      std::vector< Package::WeakPointer >::iterator i;
+      for (i=mAlive.begin();i!=mAlive.end();++i)
+       {
+         // If not dead : reinsert
+         if (i->lock())
+           {
+             bbtkDebugMessage("Kernel",7,"Package "<<i->lock()->GetName()
+                              <<" still alive"<<std::endl);
+             // InsertPackage(i->lock());
+           }
+       }      
+    }
+    while (mPackageMap.size()>0);
+
     bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
@@ -358,9 +378,10 @@ namespace bbtk
      // remove the entry in the map
      mPackageMap.erase(i);
      // Release the package if not already destroyed
-     if (p.lock()) Package::Release(p);
-
-
+     if (p.lock()) 
+       {
+        Package::Release(p);
+       }
      bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 448e2fe23744974f8c23f0a932efbf2242c09922..ce87d7e37c2ccc56472c16322767a65d7283360a 100644 (file)
--- a/kernel/src/bbtkVtkBlackBoxMacros.h
+++ b/kernel/src/bbtkVtkBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkVtkBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:14 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/02/27 11:20:25 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -36,7 +36,7 @@
  */
 #ifndef __bbtkVtkBlackBoxMacros_h__
 #define __bbtkVtkBlackBoxMacros_h__
-//#include <vtkGarbageCollector.h>
+#include <vtkGarbageCollector.h>
 //#include <vtkObjectFactory.h>
 #include <vtkDebugLeaks.h>
 
@@ -47,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();                                               \
   }
 
@@ -62,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));                   \
@@ -76,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;                                                          \
-  }                                                                    \
+  }                                                                    
 
 
 //===========================================================================
@@ -93,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)              \
@@ -104,7 +147,7 @@
   { return GetImageDataInput(0); /*vtkParent::GetInput();*/ }          \
   void bbSetInput##NAME (TYPE d)                                       \
   { vtkParent::SetInput( (vtkDataObject*) d);                          \
-    /*bbSetModifiedStatus();*/ }                               
+    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }                                
 //===========================================================================
 
 //===========================================================================
@@ -115,7 +158,7 @@
   { return GetPolyDataInput(0); /*vtkParent::GetInput();*/ }           \
   void bbSetInput##NAME (TYPE d)                                       \
   { vtkParent::SetInput( (vtkDataObject*) d);                          \
-    /*bbSetModifiedStatus();*/ }                                                      
+    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }                                                       
 //===========================================================================
 
 //===========================================================================
@@ -135,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;*/ }
 
 //===========================================================================
 

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index 8ff343d308cb8f2d08b53e42e97e79f247b06c64..ccfba10fce9c18e1d5ba4b385553b680267808b4 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.cxx
+++ b/packages/vtk/src/bbvtkImagePlanes.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/08 10:18:37 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2009/02/27 11:20:26 $
+  Version:   $Revision: 1.20 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -108,25 +108,25 @@ namespace bbvtk
 {
 
   //================================================================
- class myCallbackPlane : public vtkCommand
+  class ImagePlanes::VtkCallbackType : public vtkCommand
  {
  public:
-   static myCallbackPlane *New()
+   static VtkCallbackType *New()
       {
-         return new myCallbackPlane;
+         return new VtkCallbackType;
       }
    virtual void Execute(vtkObject *caller, unsigned long, void*)
    {
-       currentBlackBox->Process();
-       currentBlackBox->bbSignalOutputModification();
+       mBlackBox->Process();
+       mBlackBox->bbSignalOutputModification();
    } 
-   void SetCurrentBlackBox(ImagePlanes *cBB) {currentBlackBox = cBB;};    
-   void SetVtkPlaneWidget( vtkImagePlaneWidget *planeWidget );
-   myCallbackPlane() {};
+   void SetBlackBox(ImagePlanes *BB) { mBlackBox = BB;};    
+   //   void SetVtkPlaneWidget( vtkImagePlaneWidget *planeWidget );
+   VtkCallbackType() {};
 
  private:
-   vtkPlaneWidget *planeWidget;
-   ImagePlanes *currentBlackBox;
+   //   vtkPlaneWidget *planeWidget;
+   ImagePlanes *mBlackBox;
  };
   //================================================================
 
@@ -206,20 +206,33 @@ namespace bbvtk
 
      picker->UnRegister(NULL);
      
-     myCallbackPlane *_myCallback = myCallbackPlane::New();
-     _myCallback->SetCurrentBlackBox(this);
-     planeWidgetX->AddObserver(vtkCommand::InteractionEvent,_myCallback);
-     planeWidgetY->AddObserver(vtkCommand::InteractionEvent,_myCallback);
-     planeWidgetZ->AddObserver(vtkCommand::InteractionEvent,_myCallback);  
+     mVtkCallback = VtkCallbackType::New();
+     mVtkCallback->SetBlackBox(this);
+     planeWidgetX->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);
+     planeWidgetY->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);
+     planeWidgetZ->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);  
    }
 
 //---------------------------------------------------------------------
   void ImagePlanes::bbUserDestructor()
   {
 
-    if (bbGetOutputPlaneX()) bbGetOutputPlaneX()->UnRegister(NULL);
-    if (bbGetOutputPlaneY()) bbGetOutputPlaneY()->UnRegister(NULL);
-    if (bbGetOutputPlaneZ()) bbGetOutputPlaneZ()->UnRegister(NULL);
+    if (bbGetOutputPlaneX()) 
+      {
+       bbGetOutputPlaneX()->SetInput(NULL);
+       bbGetOutputPlaneX()->UnRegister(NULL);
+      }
+    if (bbGetOutputPlaneY()) 
+      {
+       bbGetOutputPlaneY()->SetInput(NULL);
+       bbGetOutputPlaneY()->UnRegister(NULL);
+      }
+    if (bbGetOutputPlaneZ()) 
+      {
+       bbGetOutputPlaneZ()->SetInput(NULL);
+       bbGetOutputPlaneZ()->UnRegister(NULL);
+      }
+    mVtkCallback->Delete();
   }
   
 //---------------------------------------------------------------------  

diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h
index 686ec7182d05a59760643b39cbd5d6b772f87cdf..f41e8a9c1f64dd3d532d76ec03f250c3d382a4ab 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.h
+++ b/packages/vtk/src/bbvtkImagePlanes.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.h,v $
   Language:  C++
-  Date:      $Date: 2009/01/08 10:18:37 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/02/27 11:20:26 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -63,6 +63,8 @@ namespace bbvtk
 {
 
   typedef std::vector<double> winLevel;
+
+
   
   class /*BBTK_EXPORT*/ ImagePlanes : public bbtk::AtomicBlackBox
   { 
@@ -87,6 +89,8 @@ namespace bbvtk
     virtual void bbUserDestructor();
     void Init();
   private:
+    class VtkCallbackType;
+    VtkCallbackType* mVtkCallback;
     vtkImageData* image;
   };