X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.h;h=d18b8aa25154f8bcdea8130181073a66bd41df98;hb=333b90638d58e788efffee2c61da9e152016e292;hp=e431b065b0a2c201e2b992a04a26bcb17ab650a5;hpb=4743efc603c9eeac3b8bc509b5112a76d12b1375;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index e431b06..d18b8aa 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.h
+++ b/packages/vtk/src/bbvtkVolumeRenderer.h
@@ -1,32 +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: bbvtkVolumeRenderer.h,v $
   Language:  C++
-  Date:      $Date: 2009/07/08 14:23:08 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  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.
-* ------------------------------------------------------------------------ */                                                                         
 
 
 /**
@@ -64,34 +70,35 @@
 #include "vtkVolume.h"
 
 #include "vtkPiecewiseFunction.h"
+#include "vtkColorTransferFunction.h"
 
 #include "bbvtk_EXPORT.h"
+#include "vtkVolumeProperty.h"
 
 namespace bbvtk
 {
-
-
-  
   class bbvtk_EXPORT VolumeRenderer : public bbtk::AtomicBlackBox
   { 
   public:
     BBTK_BLACK_BOX_INTERFACE(VolumeRenderer,bbtk::AtomicBlackBox);
 
-    BBTK_DECLARE_INPUT(In,vtkImageData *);
-    BBTK_DECLARE_INPUT(ColorFunction,vtkPiecewiseFunction*);
-	BBTK_DECLARE_INPUT(ColorFunction1,vtkColorTransferFunction *);
+    BBTK_DECLARE_INPUT(In,             vtkImageData *);
+    BBTK_DECLARE_INPUT(ColorFunction,  vtkPiecewiseFunction*);
+    BBTK_DECLARE_INPUT(ColorFunction1, vtkColorTransferFunction *);
     BBTK_DECLARE_INPUT(OpacityFunction,vtkPiecewiseFunction*);
-    BBTK_DECLARE_OUTPUT(Out,vtkProp3D*);
+    
+    BBTK_DECLARE_OUTPUT(Out, vtkProp3D*);
     BBTK_PROCESS(Process);
     void Process();
     
   protected:
 
   private:
-    vtkVolumeProperty * mVolumeProperty;
-    vtkVolumeRayCastCompositeFunction * mRayCastFunction;
-    vtkVolumeRayCastMapper* mMapper;
-    vtkVolume* mVolume;
+    vtkVolumeProperty                 *mVolumeProperty;
+    vtkVolumeRayCastCompositeFunction *mRayCastFunction;
+    vtkVolumeRayCastMapper            *mMapper;
+    vtkVolume                         *mVolume;
+    vtkVolumeProperty                 *_volumeProperty;
   };
    
   //=================================================================
@@ -101,11 +108,12 @@ namespace bbvtk
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Renders a 3D image. Creates a vtkProp3D object to insert into a 3D scene (e.g. a Viewer3D)");
   BBTK_CATEGORY("3D object creator");
-  BBTK_INPUT(VolumeRenderer,ColorFunction,"Color function",vtkPiecewiseFunction*,"");
-  BBTK_INPUT(VolumeRenderer,ColorFunction1,"Color function1 instead of Color function",vtkColorTransferFunction*,"");
-  BBTK_INPUT(VolumeRenderer,OpacityFunction,"Opacity function",vtkPiecewiseFunction*,"");
-  BBTK_INPUT(VolumeRenderer,In,"Input Image",vtkImageData *,"");
-  BBTK_OUTPUT(VolumeRenderer,Out,"3D object to plug into a 3D viewer",vtkProp3D*,"");
+  BBTK_INPUT(VolumeRenderer,ColorFunction,  "Color function",                           vtkPiecewiseFunction*,"");
+  BBTK_INPUT(VolumeRenderer,ColorFunction1, "Color function1 instead of Color function",vtkColorTransferFunction*,"");
+  BBTK_INPUT(VolumeRenderer,OpacityFunction,"Opacity function",                         vtkPiecewiseFunction*,"");
+  BBTK_INPUT(VolumeRenderer,In,             "Input Image",                              vtkImageData *,"");
+  
+  BBTK_OUTPUT(VolumeRenderer,Out, "3D object to plug into a 3D viewer",vtkProp3D*, "");
   BBTK_END_DESCRIBE_BLACK_BOX(VolumeRenderer);
   //=================================================================