X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fvtk%2Fsrc%2FbbvtkMarchingCubes.h;h=083d05d206037a4f71fb64c5def4c93ed2c656de;hb=ba235cfa6ce74178ab468c01af002af0ab3a7d82;hp=fd1041bdb68e658adfef62d4a8ffe4de2ea1b362;hpb=f303df63e2a2e33d698c974858f288058d980ae4;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMarchingCubes.h b/packages/vtk/src/bbvtkMarchingCubes.h
index fd1041b..083d05d 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/02/13 08:21:38 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/05/07 07:26:51 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,6 +37,7 @@
 
 
 #include "bbtkAtomicBlackBox.h"
+#include "bbtkVtkBlackBoxMacros.h"
 #include "vtkMarchingCubes.h"
 #include "vtkImageData.h"
 
@@ -49,10 +50,12 @@ namespace bbvtk
     public bbtk::AtomicBlackBox,
     public vtkMarchingCubes
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(MarchingCubes,bbtk::AtomicBlackBox);
-    
-    BBTK_DECLARE_VTK_INPUT(vtkMarchingCubes,In,vtkImageData *);
-    BBTK_DECLARE_VTK_OUTPUT(vtkMarchingCubes,Out,vtkPolyData *);
+    BBTK_VTK_BLACK_BOX_INTERFACE(MarchingCubes,
+				 bbtk::AtomicBlackBox,
+				 vtkMarchingCubes);
+
+    BBTK_DECLARE_VTK_INPUT(In,vtkImageData *);
+    BBTK_DECLARE_VTK_OUTPUT(Out,vtkPolyData *);
 
     // For the 'Value' parameter, the standard bbtk macro does not work 
     // as vtk Get/Set accessors have a parameter...
@@ -63,12 +66,7 @@ namespace bbvtk
     void bbSetInputValue (double d)	
        { vtkMarchingCubes::SetValue(0,d); }
 
-    
-    BBTK_PROCESS(DoProcess);
-    void DoProcess() { vtkMarchingCubes::Update(); }
-
-    // Overload bbDelete to handle vtk reference counting
-    void bbDelete() { Delete(); }
+    BBTK_VTK_PROCESS();
   };
   //=======================================================================
   
@@ -79,9 +77,9 @@ namespace bbvtk
   BBTK_DESCRIPTION("Extracts an iso-surface of an image using the marching cubes algorithm (bbfication of vtkMarchingCubes)");
   BBTK_CATEGORY("image;mesh");
 
-  BBTK_INPUT(MarchingCubes,In,"Image",vtkImageData*);
-  BBTK_INPUT(MarchingCubes,Value,"Value of the iso-surface",double);
-  BBTK_OUTPUT(MarchingCubes,Out,"Output iso-surface",vtkPolyData*);
+  BBTK_INPUT(MarchingCubes,In,"Image",vtkImageData*,"");
+  BBTK_INPUT(MarchingCubes,Value,"Value of the iso-surface",double,"");
+  BBTK_OUTPUT(MarchingCubes,Out,"Output iso-surface",vtkPolyData*,"");
   
   BBTK_END_DESCRIBE_BLACK_BOX(MarchingCubes);
   //=======================================================================