X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.h;h=296f955d6110aaeae03d6fc44a0242f7f1fc46b7;hb=dd84f147fb40d2d98ea5f915081c8be0352f7ed1;hp=cc2998ec8946544441b3a69f694ba3534a09d49e;hpb=ff64736c7b0524ea73c6f1ca1ca569593c8e0946;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index cc2998e..296f955 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.h
+++ b/packages/vtk/src/bbvtkVolumeRenderer.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkVolumeRenderer.h,v $
   Language:  C++
-  Date:      $Date: 2008/12/16 12:48:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/08/07 15:06:26 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,8 +64,10 @@
 #include "vtkVolume.h"
 
 #include "vtkPiecewiseFunction.h"
+#include "vtkColorTransferFunction.h"
 
 #include "bbvtk_EXPORT.h"
+#include "vtkVolumeProperty.h"
 
 namespace bbvtk
 {
@@ -79,21 +81,20 @@ namespace bbvtk
 
     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_PROCESS(Process);
     void Process();
     
   protected:
-    virtual void bbUserConstructor();
-    virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-    virtual void bbUserDestructor();
-    void Init();
+
   private:
     vtkVolumeProperty * mVolumeProperty;
     vtkVolumeRayCastCompositeFunction * mRayCastFunction;
     vtkVolumeRayCastMapper* mMapper;
     vtkVolume* mVolume;
+	vtkVolumeProperty* _volumeProperty;
   };
    
   //=================================================================
@@ -104,6 +105,7 @@ namespace bbvtk
   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*,"");