.

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 8b1c8ab..73f15ca 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: 2009/05/14 14:43:34 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2009/05/18 06:07:58 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -81,11 +81,11 @@
 //===========================================================================
 #define BBTK_VTK_DELETE()                                              \
   int bbDelete() {                                                     \
-    for (int i=0; i<vtkParent::GetNumberOfInputPorts();++i)            \
-      vtkParent::SetInput(i,0);                                                \
+    for (int i=0; i<mVtkObject->GetNumberOfInputPorts();++i)           \
+      mVtkObject->SetInput(i,0);                                               \
     bbGetOutputOut()->SetSource(NULL);                                 \
-    int refs = GetReferenceCount()-1;                                  \
-    vtkParent::Delete();                                               \
+    int refs = mVtkObject->GetReferenceCount()-1;                                      \
+    mVtkObject->Delete();                                              \
     return refs;                                                       \
   }
 
@@ -103,7 +103,7 @@
     bbtkDebugMessage("object",1,"<## "<<#CLASS                         \
                     <<"::New(\""<<name<<"\")"<<std::endl);             \
     return p;                                                          \
-  }                                                                    \
+  }                                                                    
 //===========================================================================
 
 //===========================================================================
@@ -124,11 +124,13 @@
 #define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKPARENT)   \
   BBTK_BLACK_BOX_INTERFACE_WITHOUT_NEW(CLASS,PARENTBLACKBOX);          \
   typedef VTKPARENT vtkParent;                                         \
-  BBTK_VTK_DELETE();                                                   \
+    BBTK_VTK_DELETE();                                                 \
   public :                                                             \
-  BBTK_VTK_NEW(CLASS,VTKPARENT);                                       \
-  BBTK_VTK_CLONE(CLASS,VTKPARENT);                                     
-
+    BBTK_VTK_NEW(CLASS,VTKPARENT);                                     \
+    BBTK_VTK_CLONE(CLASS,VTKPARENT);                                   \
+  private:                                                              \
+      vtkParent *mVtkObject;                                            
+       
 //  BBTK_VTK_DISABLE_GARBAGE_COLLECTOR
 //===========================================================================
 
@@ -141,20 +143,20 @@
 #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)              \
   public:                                                              \
   TYPE bbGetInput##NAME ()                                             \
-  { return GetImageDataInput(0); /*vtkParent::GetInput();*/ }          \
+  { return mVtkObject->GetImageDataInput(0); /*vtkParent::GetInput();*/ }              \
   void bbSetInput##NAME (TYPE d)                                       \
-  { vtkParent::SetInput( (vtkDataObject*) d);                          \
+  { mVtkObject->SetInput( (vtkDataObject*) d);                         \
     BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }                                
 //===========================================================================
 
 //===========================================================================
 /// Declares a vtkPolyDataAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)          \
+#define BBTK_DECLARE_VTK_POL÷,TYPE)           \
   public:                                                              \
   TYPE bbGetInput##NAME ()                                             \
-  { return GetPolyDataInput(0); /*vtkParent::GetInput();*/ }           \
+  { return mVtkObject->GetPolyDataInput(0); /*vtkParent::GetInput();*/ }               \
   void bbSetInput##NAME (TYPE d)                                       \
-  { vtkParent::SetInput( (vtkDataObject*) d);                          \
+  { mVtkObject->SetInput( (vtkDataObject*) d);                         \
     BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }                                                       
 //===========================================================================
 
@@ -163,7 +165,7 @@
 #define BBTK_DECLARE_VTK_OUTPUT(NAME,TYPE)                             \
   public:                                                              \
   TYPE bbGetOutput##NAME ()                                            \
-  { return vtkParent::GetOutput(); }                                   \
+  { return mVtkObject->GetOutput(); }                                  \
   void bbSetOutput##NAME (TYPE d)                                      \
   { /*vtkParent::GetOutput() = d;*/ }                                  
 //===========================================================================
@@ -173,9 +175,9 @@
 #define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)                      \
   public:                                                              \
   TYPE bbGetInput##NAME ()                                             \
-  { return dynamic_cast<TYPE>(vtkParent::GetInput()); }                        \
+  { return dynamic_cast<TYPE>(mVtkObject->GetInput()); }                       \
   void bbSetInput##NAME (TYPE d)                                       \
-  { vtkParent::SetInput( (vtkDataObject*) d);                          \
+  { mVtkObject->SetInput( (vtkDataObject*) d);                         \
    BBTK_VTK_UNREGISTER(d);/*vtkParent::GetOutput() = d;*/ }
 
 //===========================================================================
@@ -188,9 +190,9 @@
 #define BBTK_DECLARE_VTK_PARAM(NAME,TYPE)                      \
   public:                                                              \
   TYPE bbGetInput##NAME ()                                             \
-  { return vtkParent::Get##NAME(); }                                   \
+  { return mVtkObject->Get##NAME(); }                                  \
   void bbSetInput##NAME (TYPE d)                                       \
-  { vtkParent::Set##NAME(d);                                           \
+  { mVtkObject->Set##NAME(d);                                          \
   }
 //===========================================================================
 
@@ -205,10 +207,10 @@
   TYPE bbGetInput##NAME ()                                             \
   {
   TO DO : HOW TO RECOMPOSE A VECTOR ?
-  { return vtkParent::Get##NAME(); }                                   \
+  { return mVtkObject->Get##NAME(); }                                  \
   void bbSetInput##NAME (TYPE d)                                       \
   { 
-  vtkParent::Set##NAME(d[0],d[1]);             \
+  mVtkObject->Set##NAME(d[0],d[1]);            \
 }
 */
 //===========================================================================
@@ -223,7 +225,7 @@
   {                                                                    \
     bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()   \
                     <<"]"<<std::endl);                                 \
-    vtkParent::Update();                                               \
+    mVtkObject->Update();                                              \
     bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()   \
                     <<"]"<<std::endl);                                 \
   }

diff --git a/packages/vtk/src/bbvtkAppendPolyData.xml b/packages/vtk/src/bbvtkAppendPolyData.xml
index fe27239..4fa7bc1 100644 (file)
--- a/packages/vtk/src/bbvtkAppendPolyData.xml
+++ b/packages/vtk/src/bbvtkAppendPolyData.xml
@@ -19,13 +19,13 @@
 
 <process>
 <PRE>
-  SetInput(bbGetInputIn1());
-  SetInput(bbGetInputIn2());
-  SetInput(bbGetInputIn3());
-  SetInput(bbGetInputIn4());
-  SetInput(bbGetInputIn5());
+  mVtkObject->SetInput(bbGetInputIn1());
+  mVtkObject->SetInput(bbGetInputIn2());
+  mVtkObject->SetInput(bbGetInputIn3());
+  mVtkObject->SetInput(bbGetInputIn4());
+  mVtkObject->SetInput(bbGetInputIn5());
    
-  Update();
+  mVtkObject->Update();
 </PRE>
 </process>
 

diff --git a/packages/vtk/src/bbvtkConeSource.xml b/packages/vtk/src/bbvtkConeSource.xml
index 0faf6f2..4573f78 100644 (file)
--- a/packages/vtk/src/bbvtkConeSource.xml
+++ b/packages/vtk/src/bbvtkConeSource.xml
@@ -22,17 +22,17 @@
 
 <process>
 <PRE>
-SetCenter(bbGetInputCenterX(), 
+mVtkObject->SetCenter(bbGetInputCenterX(), 
           bbGetInputCenterY(), 
           bbGetInputCenterZ());
 
-SetDirection(bbGetInputDirectionX(), 
+mVtkObject->SetDirection(bbGetInputDirectionX(), 
           bbGetInputDirectionY(),
           bbGetInputDirectionZ());
                     
-SetResolution(bbGetInputResolution());
-SetRadius((double)bbGetInputRadius());
-Update();
+mVtkObject->SetResolution(bbGetInputResolution());
+mVtkObject->SetRadius((double)bbGetInputRadius());
+mVtkObject->Update();
 </PRE>
 </process>
 

diff --git a/packages/vtk/src/bbvtkImageDilateErode3D.xml b/packages/vtk/src/bbvtkImageDilateErode3D.xml
index 548a128..67ec15f 100644 (file)
--- a/packages/vtk/src/bbvtkImageDilateErode3D.xml
+++ b/packages/vtk/src/bbvtkImageDilateErode3D.xml
@@ -21,10 +21,10 @@
 
 <process>
 <PRE>
-SetKernelSize(bbGetInputKernelSizeX(), 
+mVtkObject->SetKernelSize(bbGetInputKernelSizeX(), 
               bbGetInputKernelSizeY(), 
               bbGetInputKernelSizeZ());
-Update();
+mVtkObject->Update();
 </PRE>
 </process>
 

diff --git a/packages/vtk/src/bbvtkImageGaussianSmooth.xml b/packages/vtk/src/bbvtkImageGaussianSmooth.xml
index c73c88c..18d9381 100644 (file)
--- a/packages/vtk/src/bbvtkImageGaussianSmooth.xml
+++ b/packages/vtk/src/bbvtkImageGaussianSmooth.xml
@@ -19,10 +19,10 @@
 
 <process>
 <PRE>
-SetStandardDeviation(bbGetInputStdDevX(), 
+mVtkObject->SetStandardDeviation(bbGetInputStdDevX(), 
                      bbGetInputStdDevY(), 
                      bbGetInputStdDevZ());
-Update();
+mVtkObject->Update();
 </PRE>
 </process>
 

diff --git a/packages/vtk/src/bbvtkMetaImageReader.xml b/packages/vtk/src/bbvtkMetaImageReader.xml
index e019150..e93d4f1 100644 (file)
--- a/packages/vtk/src/bbvtkMetaImageReader.xml
+++ b/packages/vtk/src/bbvtkMetaImageReader.xml
@@ -14,8 +14,8 @@
 <output name="Out" type="vtkImageData*" special="vtk output" description="Output image" />
  
  <process><PRE>
-   SetFileName(bbGetInputIn().c_str());
-   vtkParent::Update();
+   mVtkObject->SetFileName(bbGetInputIn().c_str());
+   mVtkObject->Update();
  </PRE></process>
 
 </blackbox>  

diff --git a/packages/vtk/src/bbvtkSphereSource.xml b/packages/vtk/src/bbvtkSphereSource.xml
index bad1264..b2e7d02 100644 (file)
--- a/packages/vtk/src/bbvtkSphereSource.xml
+++ b/packages/vtk/src/bbvtkSphereSource.xml
@@ -19,10 +19,10 @@
 
 <process>
 <PRE>
-SetCenter(bbGetInputCenterX(), 
+mVtkObject->SetCenter(bbGetInputCenterX(), 
           bbGetInputCenterY(), 
           bbGetInputCenterZ());
-Update();
+mVtkObject->Update();
 </PRE>
 </process>