X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMarchingCubes.h;h=6198ee99860b78b363f20af51fc3af8d1e9b1e2c;hb=5ef20de28d80f6a2e34321fa000cf02914029365;hp=6ad955504ee51dc1d4b282b84aafa03584be3af1;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMarchingCubes.h b/packages/vtk/src/bbvtkMarchingCubes.h
index 6ad9555..6198ee9 100644
--- a/packages/vtk/src/bbvtkMarchingCubes.h
+++ b/packages/vtk/src/bbvtkMarchingCubes.h
@@ -1,20 +1,39 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   Program:   bbtk
   Module:    $RCSfile: bbvtkMarchingCubes.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  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: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.10 $
+=========================================================================*/
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -37,6 +56,7 @@
 
 
 #include "bbtkAtomicBlackBox.h"
+#include "bbtkVtkBlackBoxMacros.h"
 #include "vtkMarchingCubes.h"
 #include "vtkImageData.h"
 
@@ -46,29 +66,42 @@ namespace bbvtk
    //=======================================================================
   class /*BBTK_EXPORT*/ MarchingCubes
     : 
-    public bbtk::AtomicBlackBox,
-    public vtkMarchingCubes
+    public bbtk::AtomicBlackBox 
+//    ,public vtkMarchingCubes
   {
-    BBTK_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_INPUT(Value,double);
+	BBTK_DECLARE_INPUT(ComputeNormalsOn,bool);
+	BBTK_DECLARE_INPUT(ComputeScalarsOn,bool);
+    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...
     //  BBTK_DECLARE_VTK_PARAM(vtkMarchingCubes,Value,double);
     // Hence have to wrap the accessors "by hand" :
+	  
+	 /* 
     double bbGetInputValue ()
        { return vtkMarchingCubes::GetValue(0); }
     void bbSetInputValue (double d)	
-       { vtkMarchingCubes::SetValue(0,d); }
-
-    
-    BBTK_PROCESS(DoProcess);
-    void DoProcess() { vtkMarchingCubes::Update(); }
+       { // vtkMarchingCubes::SetValue(0,d);
+		   
+		   mVtkObject->SetValue(0,1000.0);
+
+		   std::cout <<  "EED MarchingCubes::bbSetInputValue " << d << std::endl;
+	   
+	   }
+*/
+	  
+	  
+  // BBTK_VTK_PROCESS();
+	  BBTK_PROCESS(Process);
+	  void Process();
 
-    // Overload bbDelete to handle vtk reference counting
-    void bbDelete() { Delete(); }
   };
   //=======================================================================
   
@@ -81,6 +114,8 @@ namespace bbvtk
 
   BBTK_INPUT(MarchingCubes,In,"Image",vtkImageData*,"");
   BBTK_INPUT(MarchingCubes,Value,"Value of the iso-surface",double,"");
+  BBTK_INPUT(MarchingCubes,ComputeNormalsOn,"Set the computation of normals",bool,"");
+  BBTK_INPUT(MarchingCubes,ComputeScalarsOn,"Set the computation of scalars",bool,"");
   BBTK_OUTPUT(MarchingCubes,Out,"Output iso-surface",vtkPolyData*,"");
   
   BBTK_END_DESCRIBE_BLACK_BOX(MarchingCubes);