X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMarchingCubes.h;h=9e3d118e382c66b84616066c3b0b582aa82c9d15;hb=22eae0242d8e2c1eb8a25a735289f609b17e103f;hp=fd1041bdb68e658adfef62d4a8ffe4de2ea1b362;hpb=f303df63e2a2e33d698c974858f288058d980ae4;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMarchingCubes.h b/packages/vtk/src/bbvtkMarchingCubes.h
index fd1041b..9e3d118 100644
--- a/packages/vtk/src/bbvtkMarchingCubes.h
+++ b/packages/vtk/src/bbvtkMarchingCubes.h
@@ -1,20 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbvtkMarchingCubes.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/13 08:21:38 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2008/10/17 08:18:30 $
+  Version:   $Revision: 1.7 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -37,6 +51,7 @@
 
 
 #include "bbtkAtomicBlackBox.h"
+#include "bbtkVtkBlackBoxMacros.h"
 #include "vtkMarchingCubes.h"
 #include "vtkImageData.h"
 
@@ -49,10 +64,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 +80,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 +91,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);
   //=======================================================================