compile under linux ok

[bbtk.git] / packages / vtk / src / bbvtkVolumeRenderer.h

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index cc2998ec8946544441b3a69f694ba3534a09d49e..efaacb789461f85d0c9d77001b575ac72bff96dc 100644 (file)
--- 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/07/08 15:18:18 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,6 +64,7 @@
 #include "vtkVolume.h"
 
 #include "vtkPiecewiseFunction.h"
+#include "vtkColorTransferFunction.h"
 
 #include "bbvtk_EXPORT.h"
 
@@ -79,16 +80,14 @@ 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;
@@ -104,6 +103,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*,"");