From: guigues <guigues>
Date: Mon, 18 May 2009 10:45:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~43
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8dd53a72bc1dd1ca2c6e2763c0aeb51c77ee352e;p=bbtk.git

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

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index 48f8bb0..390e5b0 100644
--- a/kernel/appli/bbfy/bbfy.cpp
+++ b/kernel/appli/bbfy/bbfy.cpp
@@ -63,7 +63,7 @@ private:
   bool mIsWidget;
   std::string mParentBlackBox;
   std::string mItkParent;
-  std::string mVtkParent;
+  std::string mVtkObject;
   bool mGeneric;
   std::string mAuthor;
   std::string mDescription;
@@ -196,27 +196,27 @@ void bbfy::ParseXML()
       else if (bbtype == vtkImageAlgorithmString)
 	{
 	  mType = vtkImageAlgorithm;
-	  // Looks for <vtkparent> tag
-	  if (!BB.nChildNode("vtkparent")) 
+	  // Looks for <vtkobject> tag
+	  if (!BB.nChildNode("vtkobject")) 
 	    {
 	      throw bbfyException("Error : blackbox type '"
 				  +vtkImageAlgorithmString
-				  +"' but no <vtkparent> tag found (mandatory)");
+				  +"' but no <vtkobject> tag found (mandatory)");
 	    }
-	  bbtk::GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
+	  bbtk::GetTextOrClear(BB.getChildNode("vtkobject"),mVtkObject);
 	  // 
 	}
     else if (bbtype == vtkPolyDataAlgorithmString )
 	{
 	  mType = vtkPolyDataAlgorithm;
-	  // Looks for <vtkparent> tag
-	  if (!BB.nChildNode("vtkparent")) 
+	  // Looks for <vtkobject> tag
+	  if (!BB.nChildNode("vtkobject")) 
 	    {
 	      throw bbfyException("Error : blackbox type '"
 				  +vtkPolyDataAlgorithmString
-				  +"' but no <vtkparent> tag found (mandatory)");
+				  +"' but no <vtkobject> tag found (mandatory)");
 	    }
-	  bbtk::GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
+	  bbtk::GetTextOrClear(BB.getChildNode("vtkobject"),mVtkObject);
 	  // 
 	}
      else 
@@ -568,12 +568,6 @@ void bbfy::CreateHeader()
     {
       mFile << "   public " << mItkParent <<",\n";
     }
-//EED 15mai2009	
-//  else if ( (mType == vtkImageAlgorithm) ||
-//	    (mType == vtkPolyDataAlgorithm) )
-//   {
-//      mFile << "   public " << mVtkParent <<",\n";
-//    }
 
   mFile << "   public "<<mParentBlackBox << "\n";
 
@@ -597,7 +591,7 @@ void bbfy::CreateHeader()
       mFile << "  BBTK_VTK_BLACK_BOX_INTERFACE("
 	    << mName << ","
 	    << mParentBlackBox << ","
-	    << mVtkParent 
+	    << mVtkObject
 	    << ");\n";
     }
 	
@@ -614,19 +608,7 @@ void bbfy::CreateHeader()
       mFile << *i <<"\n";
     }
 
-  // Declare user constructor / copy cons /destr 
-  /*
-  mFile << "//=================================================================="<<std::endl;
-  mFile << "/// User callback called in the box contructor"<<std::endl;
-
-  mFile << "virtual void bbUserConstructor();"<<std::endl;
-  mFile << "/// User callback called in the box copy constructor"<<std::endl;
-  mFile << "virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);"<<std::endl;
-  mFile << "/// User callback called in the box destructor"<<std::endl;
-  mFile << "virtual void bbUserDestructor();"<<std::endl;
-  mFile << "//=================================================================="<<std::endl; 
 
-  */
 
   // Inputs
   std::vector<IO>::iterator ioi;
@@ -1082,7 +1064,7 @@ void bbfy::CreateCode()
   mFile << "{"<<std::endl;  
 	if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
 	{
-		mFile << "   mVtkObject = NULL;\n";
+		mFile << "   BBTK_VTK_SET_DEFAULT_VALUES();\n";
 	}
 	mFile << mUserSetDefaultValues << std::endl;
   mFile << "}" << std::endl;
@@ -1093,7 +1075,7 @@ void bbfy::CreateCode()
   mFile << "{"<<std::endl;
 	if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
 	{
-		mFile <<  "  mVtkObject = "<< mVtkParent <<"::New();\n";
+		mFile <<  "  BBTK_VTK_INITIALIZE_PROCESSING();\n";
 	}
 	mFile << mUserInitializeProcessing << std::endl;
   mFile << "}" << std::endl;
@@ -1103,7 +1085,7 @@ void bbfy::CreateCode()
   mFile << "{"<<std::endl;
 	if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
 	{
-		mFile << "   mVtkObject->Delete();\n";
+		mFile << "   BBTK_VTK_FINALIZE_PROCESSING();\n";
 	}
 	mFile << mUserFinalizeProcessing << std::endl;
   mFile << "}" << std::endl;
diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index aa70474..a53e485 100644
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:33 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2009/05/18 10:45:40 $
+  Version:   $Revision: 1.17 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -245,7 +245,8 @@
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS)				\
   bbtkDebugMessage("object",2,"==> "<<#CLASS <<"::~"<< #CLASS		\
-		   <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);	
+		   <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);	\
+  bbFinalizeProcessing();						
 
 
 //============================================================================
@@ -279,7 +280,6 @@
   CLASS::~CLASS()							\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    CLASS::bbUserFinalizeProcessing();					\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   void CLASS::bbLockDescriptor() 					\
@@ -568,7 +568,6 @@
   CLASS<T>::~CLASS()							\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    CLASS<T>::bbFinalizeProcessing();					\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   template <class T>							\
@@ -743,7 +742,6 @@
   CLASS<T1,T2>::~CLASS()						\
   {									\
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);				\
-    CLASS<T1,T2>::bbFinalizeProcessing();				\
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);				\
   }									\
   template <class T1, class T2>						\
diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 76fce53..fbf94a0 100644
--- 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: 2009/05/14 14:43:33 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2009/05/18 10:45:40 $
+  Version:   $Revision: 1.45 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -756,6 +756,7 @@ namespace bbtk
   //=========================================================================
   void BlackBox::bbInitializeProcessing()
   {
+    std::cout << "INIT BEFORE TEST"<<bbGetFullName()<<std::endl;
     if (!bbmInitialized) 
       {
 	std::cout << "INIT "<<bbGetFullName()<<std::endl;
diff --git a/kernel/src/bbtkQt.cxx b/kernel/src/bbtkQt.cxx
index e12409e..f7a193d 100644
--- a/kernel/src/bbtkQt.cxx
+++ b/kernel/src/bbtkQt.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkQt.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/18 10:45:41 $
+  Version:   $Revision: 1.2 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -82,7 +82,7 @@ namespace bbtk
   //=========================================================================
 
   int argc = 1;
-  char* argv = "QApp";
+  const char* argv = "QApp";
 
   //=========================================================================
   void Qt::CreateQtAppIfNeeded()
@@ -95,7 +95,8 @@ namespace bbtk
 	    bbtkGlobalError("Qt::CreateQtAppIfNeeded() : INTERNAL ERROR ! (QCoreApplication::instance()==0) && (mgQtApp != 0)");
 	  }
 	bbtkDebugMessage("qt",1,"  --> Creating bbtk QApplication"<<std::endl);
-	mgQtApp = new QApplication(argc,&argv);
+	char* aargv = const_cast<char*>(argv);
+	mgQtApp = new QApplication(argc,&aargv);
 
 	//	std::cout << ">>>> mgQtApp.exec()"<<std::endl;
 	
diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 73f15ca..45b83d9 100644
--- 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: 2009/05/18 06:07:58 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/05/18 10:45:41 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -48,41 +48,31 @@
 //===========================================================================
 
 //===========================================================================
-#define BBTK_VTK_DISABLE_GARBAGE_COLLECTOR				\
-  public:								\
-  virtual void Register(vtkObjectBase* o) {}				\
-  virtual void UnRegister(vtkObjectBase* o) {}				\
-  protected:								\
-  virtual void ReportReferences(vtkGarbageCollector* collector) {}
+#define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKOBJECT)	\
+  BBTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX);			\
+  typedef VTKOBJECT bbVtkObject;					\
+  bbVtkObject* bbGetVtkObject() { return mVtkObject; }			\
+  private:								\
+  bbVtkObject *mVtkObject;						
+
+//===========================================================================
+#define BBTK_VTK_SET_DEFAULT_VALUES()		\
+  mVtkObject = NULL;
+
+//===========================================================================
+#define BBTK_VTK_INITIALIZE_PROCESSING()	\
+  mVtkObject = bbVtkObject::New();
 
-/*
-	
-  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_FINALIZE_PROCESSING()		\
+  if (mVtkObject) { mVtkObject->Delete(); mVtkObject = NULL; }
 
+/*
 //===========================================================================
 #define BBTK_VTK_DELETE()						\
   int bbDelete() {							\
     for (int i=0; i<mVtkObject->GetNumberOfInputPorts();++i)		\
-      mVtkObject->SetInput(i,0);						\
+    mVtkObject->SetInput(i,0);						\
     bbGetOutputOut()->SetSource(NULL);					\
     int refs = mVtkObject->GetReferenceCount()-1;					\
     mVtkObject->Delete();						\
@@ -91,73 +81,29 @@
 
 //    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_WITHOUT_NEW(CLASS,PARENTBLACKBOX);		\
-  typedef VTKPARENT vtkParent;						\
-    BBTK_VTK_DELETE();							\
-  public :								\
-    BBTK_VTK_NEW(CLASS,VTKPARENT);					\
-    BBTK_VTK_CLONE(CLASS,VTKPARENT);					\
-  private:                                                              \
-      vtkParent *mVtkObject;                                            
-       
-//  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)		\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return mVtkObject->GetImageDataInput(0); /*vtkParent::GetInput();*/ }		\
+  { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \
   void bbSetInput##NAME (TYPE d)					\
-  { mVtkObject->SetInput( (vtkDataObject*) d);				\
-    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }				
+  { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); }
+
 //===========================================================================
 
 //===========================================================================
 /// Declares a vtkPolyDataAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_POL÷,TYPE)		\
+#define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)		\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return mVtkObject->GetPolyDataInput(0); /*vtkParent::GetInput();*/ }		\
+  { if (mVtkObject) return mVtkObject->GetPolyDataInput(0); return 0; } \
   void bbSetInput##NAME (TYPE d)					\
-  { mVtkObject->SetInput( (vtkDataObject*) d);				\
-    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }						       
+  { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); }
+
 //===========================================================================
 
 //===========================================================================
@@ -165,20 +111,20 @@
 #define BBTK_DECLARE_VTK_OUTPUT(NAME,TYPE)				\
   public:								\
   TYPE bbGetOutput##NAME ()						\
-  { return mVtkObject->GetOutput(); }					\
-  void bbSetOutput##NAME (TYPE d)					\
-  { /*vtkParent::GetOutput() = d;*/ }					
+  { if (mVtkObject) return mVtkObject->GetOutput(); return 0; }		\
+  void bbSetOutput##NAME (TYPE d) 					\
+  { }					
 //===========================================================================
 
 //===========================================================================
 /// Declares a vtkAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)			\
+#define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)				\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return dynamic_cast<TYPE>(mVtkObject->GetInput()); }			\
+  { if (mVtkObject) return dynamic_cast<TYPE>(mVtkObject->GetInput());	\
+    return 0;}								\
   void bbSetInput##NAME (TYPE d)					\
-  { mVtkObject->SetInput( (vtkDataObject*) d);				\
-   BBTK_VTK_UNREGISTER(d);/*vtkParent::GetOutput() = d;*/ }
+  { if (mVtkObject)  mVtkObject->SetInput( (vtkDataObject*) d); }
 
 //===========================================================================
 
@@ -190,9 +136,9 @@
 #define BBTK_DECLARE_VTK_PARAM(NAME,TYPE)			\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return mVtkObject->Get##NAME(); }					\
+  { if (mVtkObject) return mVtkObject->Get##NAME(); return 0; }		\
   void bbSetInput##NAME (TYPE d)					\
-  { mVtkObject->Set##NAME(d);						\
+  { if (mVtkObject) mVtkObject->Set##NAME(d);				\
   }
 //===========================================================================
 
diff --git a/packages/itk/src/bbitkAnyImageToTypedImage.h b/packages/itk/src/bbitkAnyImageToTypedImage.h
index 4e68948..1dabdfb 100644
--- a/packages/itk/src/bbitkAnyImageToTypedImage.h
+++ b/packages/itk/src/bbitkAnyImageToTypedImage.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkAnyImageToTypedImage.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:21 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -91,6 +91,29 @@ namespace bbitk
   }
   //=================================================================
 
+
+  //===================================================
+  template <class T1> 
+  void AnyImageToTypedImage<T1>::bbUserSetDefaultValues() {}
+  template <class T1> 
+  void AnyImageToTypedImage<T1>::bbUserInitializeProcessing(){}
+  template <class T1> 
+  void AnyImageToTypedImage<T1>::bbUserFinalizeProcessing() {}
+  //===================================================
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
   //=================================================================
   // BlackBox declaration
   template <class itkImageTypePointer, class itkImageTypeConstPointer>
@@ -149,6 +172,21 @@ namespace bbitk
   }
   //=================================================================
 
+  //===================================================
+  template <class T1, class T2> 
+  void AnyImageToConstTypedImage<T1,T2>::bbUserSetDefaultValues() {}
+  template <class T1, class T2> 
+  void AnyImageToConstTypedImage<T1,T2>::bbUserInitializeProcessing(){}
+  template <class T1, class T2> 
+  void AnyImageToConstTypedImage<T1,T2>::bbUserFinalizeProcessing() {}
+  //===================================================
+  
+
+
+
+
+
+
 
 }
 #endif
diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.cxx b/packages/itk/src/bbitkBinaryThresholdImageFilter.cxx
index 5a093d7..a97caa0 100644
--- a/packages/itk/src/bbitkBinaryThresholdImageFilter.cxx
+++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkBinaryThresholdImageFilter.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:57:58 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -38,12 +38,27 @@ namespace bbitk
   
   BBTK_BLACK_BOX_TEMPLATE_IMPLEMENTATION(BinaryThresholdImageFilter,
 					      bbtk::AtomicBlackBox);
+
   BBTK_BLACK_BOX_IMPLEMENTATION(BinaryThresholdImageFilterGeneric,
 				     bbtk::AtomicBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,
 				BinaryThresholdImageFilterGeneric);
 	
 	
+  void BinaryThresholdImageFilterGeneric::bbUserSetDefaultValues()
+  {
+    bbSetInputLowerThreshold(0);
+    bbSetInputUpperThreshold(100);
+    bbSetInputInsideValue(255);
+    bbSetInputOutsideValue(0);
+  }
+  void BinaryThresholdImageFilterGeneric::bbUserInitializeProcessing()
+  {
+  }
+  void BinaryThresholdImageFilterGeneric::bbUserFinalizeProcessing()
+  {
+  }
+  
 }
 
 // EO namespace bbtk
diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h
index e6fdd10..8979fc0 100644
--- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h
+++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkBinaryThresholdImageFilter.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:57:58 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -39,6 +39,7 @@
 namespace bbitk
 {
 
+  //===================================================
   template <class T>
   class /*BBTK_EXPORT*/ BinaryThresholdImageFilter
     : 
@@ -57,9 +58,10 @@ namespace bbitk
     BBTK_ITK_PROCESS();
     BBTK_ITK_DELETE();
 
-
   };
+  //===================================================
   
+  //===================================================
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(BinaryThresholdImageFilter,
 				      bbtk::AtomicBlackBox);
   BBTK_NAME("BinaryThresholdImageFilter<"+bbtk::TypeName<T>()+">");
@@ -78,6 +80,39 @@ namespace bbitk
 		      typename T::PixelType);
   BBTK_TEMPLATE_OUTPUT(BinaryThresholdImageFilter,Out,"Output image",T*);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(BinaryThresholdImageFilter);
+  //===================================================
+
+
+  //===================================================
+  //--
+  template <class T>
+  void BinaryThresholdImageFilter<T>::bbUserSetDefaultValues()
+  {
+    bbSetInputLowerThreshold(0);
+    bbSetInputUpperThreshold(100);
+    bbSetInputInsideValue(255);
+    bbSetInputOutsideValue(0);
+  }
+  template <class T>
+  void BinaryThresholdImageFilter<T>::bbUserInitializeProcessing()
+  {
+  }	
+  template <class T>
+  void BinaryThresholdImageFilter<T>::bbUserFinalizeProcessing()
+  {
+  }
+  
+  //===================================================
+
+
+
+
+
+
+
+
+
+
   
   //===================================================
   // Generic "untemplatized" filter
@@ -99,7 +134,11 @@ namespace bbitk
     inline void ProcessSwitch();
     template <class T> void Process();
   };
+  //===================================================
+
   
+  //===================================================
+
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(BinaryThresholdImageFilterGeneric,
 				bbtk::AtomicBlackBox);
   BBTK_NAME("BinaryThresholdImageFilter");
@@ -120,13 +159,21 @@ namespace bbitk
 	      "Output image. Of the same type and dimension than the input image",
 	      anyImagePointer,"");
   BBTK_END_DESCRIBE_BLACK_BOX(BinaryThresholdImageFilterGeneric);
+  //===================================================
 
 
 
+
+  //===================================================
+
   void BinaryThresholdImageFilterGeneric::ProcessSwitch()
   {
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(bbGetInputIn().type(), this->Process);
   }
+  //===================================================
+
+
+  //===================================================
 
   template <class T> 
   void BinaryThresholdImageFilterGeneric::Process()
@@ -154,49 +201,13 @@ namespace bbitk
     bbtkDebugDecTab("Core",9);
   }
 
+  //===================================================
+
 	
-////--	
-//  template <class T>
-//  void BinaryThresholdImageFilter<T>::bbUserSetDefaultValues()
-//  {
-//    bbSetInputLowerThreshold(0);
-//    bbSetInputUpperThreshold(100);
-//    bbSetInputInsideValue(255);
-//    bbSetInputOutsideValue(0);
-//  }
-
-  void BinaryThresholdImageFilterGeneric::bbUserSetDefaultValues()
-  {
-    bbSetInputLowerThreshold(0);
-    bbSetInputUpperThreshold(100);
-    bbSetInputInsideValue(255);
-    bbSetInputOutsideValue(0);
-  }
 
- //--
 
-	template <class T>
-	void BinaryThresholdImageFilter<T>::bbUserInitializeProcessing()
-	{
-	}
-	
-	void BinaryThresholdImageFilterGeneric::bbUserInitializeProcessing()
-	{
-	}
-	
-//--
-	
-	//--
-	
-	template <class T>
-	void BinaryThresholdImageFilter<T>::bbUserFinalizeProcessing()
-	{
-	}
-	
-	void BinaryThresholdImageFilterGeneric::bbUserFinalizeProcessing()
-	{
-	}
 	
+
 	
 	
 }
diff --git a/packages/itk/src/bbitkExtractImageFilter.cxx b/packages/itk/src/bbitkExtractImageFilter.cxx
index 0bc3eb4..d53deb3 100644
--- a/packages/itk/src/bbitkExtractImageFilter.cxx
+++ b/packages/itk/src/bbitkExtractImageFilter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkExtractImageFilter.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:57:58 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -45,22 +45,33 @@ namespace bbitk
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ExtractImageFilterGeneric)
     
 
-	//-----------------------------------------------------------------	
-	void ExtractImageFilterGeneric::bbUserSetDefaultValues()
-	{
-	}
-	
-	//-----------------------------------------------------------------	
-	void ExtractImageFilterGeneric::bbUserInitializeProcessing()
-	{
-	}
-	
-	//-----------------------------------------------------------------	
-	void ExtractImageFilterGeneric::bbUserFinalizeProcessing()
-	{
-	}	
-	
-	
+
+  //===================================================
+  // Method which switches on the Process method instanciated on
+  // the type of the itk Image stored in the anyImagePointer input
+  void ExtractImageFilterGeneric::ProcessSwitch()
+  {
+     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(bbGetInputIn().type(), this->Process);
+  }
+  //===================================================
+
+
+  //-----------------------------------------------------------------	
+    void ExtractImageFilterGeneric::bbUserSetDefaultValues()
+  {
+  }
+  
+  //-----------------------------------------------------------------	
+  void ExtractImageFilterGeneric::bbUserInitializeProcessing()
+  {
+  }
+  
+  //-----------------------------------------------------------------	
+  void ExtractImageFilterGeneric::bbUserFinalizeProcessing()
+  {
+  }	
+  
+  
 } 
 // EO namespace bbitk
 
diff --git a/packages/itk/src/bbitkExtractImageFilter.h b/packages/itk/src/bbitkExtractImageFilter.h
index 8906085..e7c0cdd 100644
--- a/packages/itk/src/bbitkExtractImageFilter.h
+++ b/packages/itk/src/bbitkExtractImageFilter.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkExtractImageFilter.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/12 12:47:03 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -40,7 +40,8 @@
 namespace bbitk
 {
 
-  
+  //===================================================
+  /// Template filter
   template <class T>
   class /*BBTK_EXPORT*/ ExtractImageFilter
     : 
@@ -59,8 +60,11 @@ namespace bbitk
     BBTK_ITK_PROCESS();
     BBTK_ITK_DELETE();
   };
+  //===================================================
 
 
+  //===================================================
+  // Descriptor of template filter 
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(ExtractImageFilter,
 				      bbtk::AtomicBlackBox);
   BBTK_NAME("ExtractImageFilter<"+bbtk::TypeName<T>()+">");
@@ -70,7 +74,22 @@ namespace bbitk
   BBTK_TEMPLATE_INPUT(ExtractImageFilter,ExtractionRegion,"Extraction region",typename T::RegionType);
   BBTK_TEMPLATE_OUTPUT(ExtractImageFilter,Out,"Output image",T*);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(ExtractImageFilter);
+  //===================================================
+
+  //===================================================
+  template <class T> void ExtractImageFilter<T>::bbUserSetDefaultValues() {}
+  template <class T> void ExtractImageFilter<T>::bbUserInitializeProcessing(){}
+  template <class T> void ExtractImageFilter<T>::bbUserFinalizeProcessing() {}
+  //===================================================
   
+
+
+
+
+
+
+
+
   //===================================================
   // Generic "untemplatized" filter
   //===================================================
@@ -84,10 +103,13 @@ namespace bbitk
     BBTK_DECLARE_OUTPUT(Out,anyImagePointer);
     BBTK_PROCESS(ProcessSwitch);
   private :
-    inline void ProcessSwitch();
+    void ProcessSwitch();
     template <class T> void Process();
   };
+  //===================================================
   
+  //===================================================
+  // Descriptor of generic filter
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ExtractImageFilterGeneric,
 				bbtk::AtomicBlackBox);
   BBTK_NAME("ExtractImageFilter");
@@ -98,30 +120,55 @@ namespace bbitk
   BBTK_INPUT(ExtractImageFilterGeneric,Region,"Extraction region",anyImageRegion,"");
   BBTK_OUTPUT(ExtractImageFilterGeneric,Out,"Output image",anyImagePointer,"");
   BBTK_END_DESCRIBE_BLACK_BOX(ExtractImageFilterGeneric);
-  void ExtractImageFilterGeneric::ProcessSwitch()
-  {
-     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(bbGetInputIn().type(), this->Process);
-  }
+  //===================================================
+
 
+  //===================================================
+  // The main processing method is template on the itk image type 
+  // which was set to the input. 
+  // It is called by the ProcessSwitch method which checks the input In type
+  // and calls Process<T> where T is the right type.
   template <class T>
   void ExtractImageFilterGeneric::Process()
   {
     bbtkDebugMessageInc("Core",9,
 			"bbitk::ExtractImageFilterGeneric::Process<"
 			<<bbtk::TypeName<T>()<<">()"<<std::endl);
+    // T is the type of input image
     typedef T ImageType;
+    // We define the type of the filter to use which is template 
+    // on the image type
     typedef ExtractImageFilter<ImageType> FilterType;
+    // Allocate the filter
     typename FilterType::Pointer f = FilterType::New("Temp");
-	  typedef ImageType* ImageTypePointer; 
-    f->bbSetInputIn( this->bbGetInputIn().unsafe_get<ImageTypePointer>() );
+
+    // Set the input In of the filter
+    // Here we :
+    // 1) Get **OUR** input 'In' by bbGetInputIn()
+    //    It is a anyImagePointer
+    // 2) We **KNOW** that the actual type stored by the anyImagePointer
+    //    is ImageType* hence we get the value stored using the 
+    //    unsafe_get method (which is a template method on the return type)
+    f->bbSetInputIn( this->bbGetInputIn().unsafe_get<ImageType*>() );
+    
+    // The same for the ImageRegion except that we use 'get' and not 
+    // 'unsafe get' because the region dimension passed by the user may not be 
+    // compatible with the image dimension.
+    // If get fails it throws an exception which must be caught outside 
     f->bbSetInputExtractionRegion ( this->bbGetInputRegion().get<typename T::RegionType>() );
+
+    // Execute the filter
     f->bbExecute();
+    // Register its output or it will be deleted we delete the filter
     f->bbGetOutputOut()->Register();
+    // Set OUR output
     this->bbSetOutputOut( f->bbGetOutputOut() );
-    //  f->bbDelete();
+    // Delete the temporary filter
+    f->bbDelete();
 
     bbtkDebugDecTab("Core",9);
   }
+  //===================================================
 
 }
 // EO namespace bbitk
diff --git a/packages/itk/src/bbitkImage.h b/packages/itk/src/bbitkImage.h
index 5ecf12b..000c95b 100644
--- a/packages/itk/src/bbitkImage.h
+++ b/packages/itk/src/bbitkImage.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImage.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/27 14:58:06 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -237,7 +237,7 @@ namespace bbitk
 #    define BBTK_SWITCH_ITK_IMAGE_uint16_t_4(TYPE_INFO,FUN,CONST)
 #  endif
 #  ifdef BBTK_ITK_IMAGE_TYPE_uint32_t
-#    define BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,CONST)		\
+#    define BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,CONST)	\
   TEMPLATE_SWITCH(TYPE_INFO,Image_uint32_t_4_##CONST##ptr,FUN,Image_uint32_t_4)
 #  else
 #    define BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,CONST)
diff --git a/packages/itk/src/bbitkImageRegion.cxx b/packages/itk/src/bbitkImageRegion.cxx
index e2890b4..dab8d17 100644
--- a/packages/itk/src/bbitkImageRegion.cxx
+++ b/packages/itk/src/bbitkImageRegion.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageRegion.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:57:58 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/18 10:45:44 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -42,21 +42,15 @@ namespace bbitk
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageRegionCreator);
 
-	/*
-	void ImageRegionCreator::bbUserSetDefaultValues()		{	}	
-	void ImageRegionCreator::bbUserInitializeProcessing()	{	}
-	void ImageRegionCreator::bbUserFinalizeProcessing()		{	}	
-	
-	template <unsigned int Dimension>
-	void ImageRegionCreator::bbUserSetDefaultValues()		{	}
-	
-	template <unsigned int Dimension>
-	void ImageRegionCreator::bbUserInitializeProcessing()	{	}
-	
-	template <unsigned int Dimension>
-	void ImageRegionCreator::bbUserFinalizeProcessing()		{	}	
-	*/
+  
+  void ImageRegionCreator::bbUserSetDefaultValues()		
+  {	}
+  void ImageRegionCreator::bbUserInitializeProcessing()	
+  {	}
+  void ImageRegionCreator::bbUserFinalizeProcessing()		
+  {	}
 	
+  
   void ImageRegionCreator::DoIt()
   {
     const std::vector<long>& index = bbGetInputIndex();
@@ -66,9 +60,9 @@ namespace bbitk
     unsigned long maxs = index.size() > size.size() ? index.size() : size.size();
     switch (maxs) 
       {
-      case 2 : DoIt<2>(); break;
-      case 3 : DoIt<3>(); break;
-      case 4 : DoIt<4>(); break;
+      case 2 : DoItForDimension<2>(); break;
+      case 3 : DoItForDimension<3>(); break;
+      case 4 : DoItForDimension<4>(); break;
       default : bbtkError("ImageRegionCreator : cannot build a region of dimension "<<maxs);
       }
      
@@ -76,7 +70,7 @@ namespace bbitk
   }
 
   template <unsigned int Dimension>
-  void ImageRegionCreator::DoIt()
+  void ImageRegionCreator::DoItForDimension()
   {
     std::vector<long> index = bbGetInputIndex();
     std::vector<long> size = bbGetInputSize();
diff --git a/packages/itk/src/bbitkImageRegion.h b/packages/itk/src/bbitkImageRegion.h
index ce44ff3..92473d5 100644
--- a/packages/itk/src/bbitkImageRegion.h
+++ b/packages/itk/src/bbitkImageRegion.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageRegion.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:21 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/05/18 10:45:44 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -84,7 +84,7 @@ namespace bbitk
     BBTK_PROCESS(DoIt);
   private:
     void DoIt();
-    template <unsigned int Dimension> void DoIt();
+    template <unsigned int Dimension> void DoItForDimension();
  };
 
 
diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h
index f8d5a1e..03fbd59 100644
--- a/packages/itk/src/bbitkResampleImageFilter.h
+++ b/packages/itk/src/bbitkResampleImageFilter.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkResampleImageFilter.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:57:58 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2009/05/18 10:45:44 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -43,7 +43,8 @@ namespace bbitk
 {
 
  
-  class /*BBTK_EXPORT*/ ResampleImageFilter
+ //===================================================
+   class /*BBTK_EXPORT*/ ResampleImageFilter
     : 
     public bbtk::AtomicBlackBox
   {
@@ -59,8 +60,10 @@ namespace bbitk
     template <class T> void Process();
     itk::Object* mOutput;
   };
-  
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(ResampleImageFilter,
+ //===================================================
+   
+ //===================================================
+   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ResampleImageFilter,
 				bbtk::AtomicBlackBox);
   BBTK_NAME("ResampleImageFilter");
   BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr");
@@ -76,16 +79,20 @@ namespace bbitk
 	      "Output image. Of the same type and dimension than the input image",
 	      anyImagePointer,"");
   BBTK_END_DESCRIBE_BLACK_BOX(ResampleImageFilter);
+ //===================================================
+ 
 
 
-
-  void ResampleImageFilter::ProcessSwitch()
+ //===================================================
+   void ResampleImageFilter::ProcessSwitch()
   {
     bbtk::TypeInfo t = bbGetInputIn().type();
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t, this->Process);
   }
-
-  template <class T> 
+ //===================================================
+ 
+ //===================================================
+   template <class T> 
   void ResampleImageFilter::Process()
   {
     bbtkDebugMessageInc("Core",9,
@@ -171,7 +178,8 @@ namespace bbitk
 
     bbtkDebugDecTab("Core",9);
   }
-  
+   //===================================================
+ 
 
 	//-----------------------------------------------------------------	
 	void ResampleImageFilter::bbUserSetDefaultValues()
diff --git a/packages/itk/src/bbitkTypedImageToAnyImage.h b/packages/itk/src/bbitkTypedImageToAnyImage.h
index 2edb42f..e974b15 100644
--- a/packages/itk/src/bbitkTypedImageToAnyImage.h
+++ b/packages/itk/src/bbitkTypedImageToAnyImage.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkTypedImageToAnyImage.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:21 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/05/18 10:45:44 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -56,6 +56,16 @@ namespace bbitk
   };
   //=================================================================
  
+  //===================================================
+  template <class T> void TypedImageToAnyImage<T>::bbUserSetDefaultValues()
+  {}
+  template <class T> void TypedImageToAnyImage<T>::bbUserInitializeProcessing()
+  {}
+  template <class T> void TypedImageToAnyImage<T>::bbUserFinalizeProcessing() 
+  {}
+  //===================================================
+  
+
   //=================================================================
   // BlackBox description
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(TypedImageToAnyImage,
@@ -76,6 +86,7 @@ namespace bbitk
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(TypedImageToAnyImage);
   //=================================================================
 
+ 
 
 }
 #endif
diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 6536641..cfbeb4c 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 16:21:15 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2009/05/18 10:45:46 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -139,11 +139,11 @@ namespace bbitkvtk
     mConverter = 0;
   }
 
-	void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()
+  void itkImage2vtkImageData::bbUserInitializeProcessing()
 	{
 	}
 	
-	void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing()	
+	void itkImage2vtkImageData::bbUserFinalizeProcessing()	
 	{
 	}
 
diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h
index 2af1182..b1e1f26 100644
--- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h
+++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkvtkImageData2itkImage.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 11:17:18 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/05/18 10:45:46 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,9 +47,6 @@ namespace bbitkvtk
     BBTK_DECLARE_OUTPUT(Out,bbitk::anyImagePointer);
     BBTK_PROCESS(Convert);
     void Convert();
-    void bbUserConstructor();
-    void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-    void bbUserDestructor();
 
   private:
     // Convert method : template on type of the itk image to be created
diff --git a/packages/vtk/src/bbvtkAppendPolyData.xml b/packages/vtk/src/bbvtkAppendPolyData.xml
index 4fa7bc1..cb8dd86 100644
--- a/packages/vtk/src/bbvtkAppendPolyData.xml
+++ b/packages/vtk/src/bbvtkAppendPolyData.xml
@@ -8,7 +8,7 @@
 <category>mesh</category>
 
 <include>vtkAppendPolyData.h</include> 
-<vtkparent>vtkAppendPolyData</vtkparent>
+<vtkobject>vtkAppendPolyData</vtkobject>
 
 <output name="Out" type="vtkPolyData*" special="vtk output" description="Output Mesh"/>
 <input name="In1" type="vtkPolyData *" description="PolyData 1"/>
@@ -19,13 +19,13 @@
 
 <process>
 <PRE>
-  mVtkObject->SetInput(bbGetInputIn1());
-  mVtkObject->SetInput(bbGetInputIn2());
-  mVtkObject->SetInput(bbGetInputIn3());
-  mVtkObject->SetInput(bbGetInputIn4());
-  mVtkObject->SetInput(bbGetInputIn5());
+  bbGetVtkObject()->SetInput(bbGetInputIn1());
+  bbGetVtkObject()->SetInput(bbGetInputIn2());
+  bbGetVtkObject()->SetInput(bbGetInputIn3());
+  bbGetVtkObject()->SetInput(bbGetInputIn4());
+  bbGetVtkObject()->SetInput(bbGetInputIn5());
    
-  mVtkObject->Update();
+  bbGetVtkObject()->Update();
 </PRE>
 </process>
 
diff --git a/packages/vtk/src/bbvtkConeSource.xml b/packages/vtk/src/bbvtkConeSource.xml
index 4573f78..84cc3d1 100644
--- a/packages/vtk/src/bbvtkConeSource.xml
+++ b/packages/vtk/src/bbvtkConeSource.xml
@@ -8,7 +8,7 @@
 <category>mesh</category>
 
 <include>vtkConeSource.h</include> 
-<vtkparent>vtkConeSource</vtkparent>
+<vtkobject>vtkConeSource</vtkobject>
 
 <output name="Out"       type="vtkPolyData*" special="vtk output"    description="Output Cone"/>
 <input name="Radius"     type="double"       special="vtk parameter" description="Cone Radius"/>
@@ -22,17 +22,17 @@
 
 <process>
 <PRE>
-mVtkObject->SetCenter(bbGetInputCenterX(), 
-          bbGetInputCenterY(), 
-          bbGetInputCenterZ());
+bbGetVtkObject()->SetCenter(bbGetInputCenterX(), 
+                           bbGetInputCenterY(), 
+                           bbGetInputCenterZ());
 
-mVtkObject->SetDirection(bbGetInputDirectionX(), 
-          bbGetInputDirectionY(),
-          bbGetInputDirectionZ());
+bbGetVtkObject()->SetDirection(bbGetInputDirectionX(), 
+                               bbGetInputDirectionY(),
+                               bbGetInputDirectionZ());
                     
-mVtkObject->SetResolution(bbGetInputResolution());
-mVtkObject->SetRadius((double)bbGetInputRadius());
-mVtkObject->Update();
+bbGetVtkObject()->SetResolution(bbGetInputResolution());
+bbGetVtkObject()->SetRadius((double)bbGetInputRadius());
+bbGetVtkObject()->Update();
 </PRE>
 </process>
 
diff --git a/packages/vtk/src/bbvtkImageAnisotropicDiffusion3D.xml b/packages/vtk/src/bbvtkImageAnisotropicDiffusion3D.xml
index 4ea350a..20aa734 100644
--- a/packages/vtk/src/bbvtkImageAnisotropicDiffusion3D.xml
+++ b/packages/vtk/src/bbvtkImageAnisotropicDiffusion3D.xml
@@ -8,7 +8,7 @@
 
 <include>vtkImageAnisotropicDiffusion3D.h</include> 
 <include>vtkImageData.h</include> 
-<vtkparent>vtkImageAnisotropicDiffusion3D</vtkparent>
+<vtkobject>vtkImageAnisotropicDiffusion3D</vtkobject>
 
 <input name="In" type="vtkImageData*" special="vtk input" description="Input image"/>
 <output name="Out" type="vtkImageData*" special="vtk output" description="Output image"/>
diff --git a/packages/vtk/src/bbvtkImageCharacteristics.xml b/packages/vtk/src/bbvtkImageCharacteristics.xml
index d2d895d..0789791 100644
--- a/packages/vtk/src/bbvtkImageCharacteristics.xml
+++ b/packages/vtk/src/bbvtkImageCharacteristics.xml
@@ -6,7 +6,6 @@
 <description><PRE>Exports objet sizes, etc</PRE></description>
 <category>image;</category>
 
-<vtkparent>vtkImageData</vtkparent>
 <include>vtkImageData.h</include> 
 
 <input name="In"        type="vtkImageData*" description="Input image"/>
diff --git a/packages/vtk/src/bbvtkImageDilateErode3D.xml b/packages/vtk/src/bbvtkImageDilateErode3D.xml
index 67ec15f..352d436 100644
--- a/packages/vtk/src/bbvtkImageDilateErode3D.xml
+++ b/packages/vtk/src/bbvtkImageDilateErode3D.xml
@@ -9,7 +9,7 @@
 <include>vtkImageDilateErode3D.h</include> 
 <include>vtkImageData.h</include> 
 
-<vtkparent>vtkImageDilateErode3D</vtkparent>
+<vtkobject>vtkImageDilateErode3D</vtkobject>
 
 <input name="In"          type="vtkImageData*" special="vtk input"     description="Input image"/>
 <output name="Out"        type="vtkImageData*" special="vtk output"    description="Output image"/>
@@ -21,10 +21,10 @@
 
 <process>
 <PRE>
-mVtkObject->SetKernelSize(bbGetInputKernelSizeX(), 
+bbGetVtkObject()->SetKernelSize(bbGetInputKernelSizeX(), 
               bbGetInputKernelSizeY(), 
               bbGetInputKernelSizeZ());
-mVtkObject->Update();
+bbGetVtkObject()->Update();
 </PRE>
 </process>
 
diff --git a/packages/vtk/src/bbvtkImageGaussianSmooth.xml b/packages/vtk/src/bbvtkImageGaussianSmooth.xml
index 18d9381..c73c7fc 100644
--- a/packages/vtk/src/bbvtkImageGaussianSmooth.xml
+++ b/packages/vtk/src/bbvtkImageGaussianSmooth.xml
@@ -9,7 +9,7 @@
 <include>vtkImageGaussianSmooth.h</include> 
 <include>vtkImageData.h</include> 
 
-<vtkparent>vtkImageGaussianSmooth</vtkparent>
+<vtkobject>vtkImageGaussianSmooth</vtkobject>
 
 <input name="In"      type="vtkImageData*" special="vtk input"  description="Input image"/>  
 <output name="Out"    type="vtkImageData*" special="vtk output" description="Output image"/>
@@ -19,10 +19,10 @@
 
 <process>
 <PRE>
-mVtkObject->SetStandardDeviation(bbGetInputStdDevX(), 
+bbGetVtkObject()->SetStandardDeviation(bbGetInputStdDevX(), 
                      bbGetInputStdDevY(), 
                      bbGetInputStdDevZ());
-mVtkObject->Update();
+bbGetVtkObject()->Update();
 </PRE>
 </process>
 
diff --git a/packages/vtk/src/bbvtkMetaImageReader.xml b/packages/vtk/src/bbvtkMetaImageReader.xml
index e93d4f1..4575665 100644
--- a/packages/vtk/src/bbvtkMetaImageReader.xml
+++ b/packages/vtk/src/bbvtkMetaImageReader.xml
@@ -8,14 +8,14 @@
 
 <include>vtkMetaImageReader.h</include> 
 <include>vtkImageData.h</include> 
-<vtkparent>vtkMetaImageReader</vtkparent>
+<vtkobject>vtkMetaImageReader</vtkobject>
 
 <input  name="In"  type="std::string"   nature="file name"   description="Name of the file to read"/>  
 <output name="Out" type="vtkImageData*" special="vtk output" description="Output image" />
  
  <process><PRE>
-   mVtkObject->SetFileName(bbGetInputIn().c_str());
-   mVtkObject->Update();
+   bbGetVtkObject()->SetFileName(bbGetInputIn().c_str());
+   bbGetVtkObject()->Update();
  </PRE></process>
 
 </blackbox>  
diff --git a/packages/vtk/src/bbvtkSphereSource.xml b/packages/vtk/src/bbvtkSphereSource.xml
index b2e7d02..967cd2d 100644
--- a/packages/vtk/src/bbvtkSphereSource.xml
+++ b/packages/vtk/src/bbvtkSphereSource.xml
@@ -7,7 +7,7 @@
 <category>mesh</category>
 
 <include>vtkSphereSource.h</include> 
-<vtkparent>vtkSphereSource</vtkparent>
+<vtkobject>vtkSphereSource</vtkobject>
 
 <output name="Out" type="vtkPolyData*" description="Output Sphere" special="vtk output"/>
 <input name="CenterX" type="double" description="Center X coord"/>
@@ -19,10 +19,10 @@
 
 <process>
 <PRE>
-mVtkObject->SetCenter(bbGetInputCenterX(), 
+bbGetVtkObject()->SetCenter(bbGetInputCenterX(), 
           bbGetInputCenterY(), 
           bbGetInputCenterZ());
-mVtkObject->Update();
+bbGetVtkObject()->Update();
 </PRE>
 </process>