X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMarchingCubes.cxx;h=972c72f5d696c03abccfd0a0af810c98c9fa12a7;hb=6827eadc2157e47cc354282c7992fe052e6b5ca0;hp=0f6238ec60a905a864348dd338e0f391569ccc5e;hpb=3f3e9c6b8189876ae514632d39ee5f2903b6b6ab;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMarchingCubes.cxx b/packages/vtk/src/bbvtkMarchingCubes.cxx
index 0f6238e..972c72f 100644
--- a/packages/vtk/src/bbvtkMarchingCubes.cxx
+++ b/packages/vtk/src/bbvtkMarchingCubes.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/12/18 18:37:56 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -48,12 +53,17 @@ namespace bbvtk
 
 	void MarchingCubes::Process()
 	{
-		
 		bbGetVtkObject()->SetValue(0, bbGetInputValue() );
-		bbGetVtkObject()->Update();
-		 vtkIndent indent(2);
-		bbGetVtkObject()->PrintSelf(std::cout, indent );
-		
+		if(bbGetInputComputeNormalsOn())
+			bbGetVtkObject()->ComputeNormalsOn();
+		else
+			bbGetVtkObject()->ComputeNormalsOff();
+
+		if(bbGetInputComputeScalarsOn())
+			bbGetVtkObject()->ComputeScalarsOn();
+		else
+			bbGetVtkObject()->ComputeScalarsOff();
+		bbGetVtkObject()->Update();		
 	}
 	
 	//-----------------------------------------------------------------	
@@ -61,6 +71,8 @@ namespace bbvtk
 	{
 		 BBTK_VTK_SET_DEFAULT_VALUES();
 		bbSetInputValue(400);
+		bbSetInputComputeNormalsOn(true);
+		bbSetInputComputeScalarsOn(true);
 	}
 	
 	//-----------------------------------------------------------------