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

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index cc2998e..fd8b27b 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: 2011/06/10 09:53:40 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,36 +64,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(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:
-    virtual void bbUserConstructor();
-    virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-    virtual void bbUserDestructor();
-    void Init();
+
   private:
-    vtkVolumeProperty * mVolumeProperty;
-    vtkVolumeRayCastCompositeFunction * mRayCastFunction;
-    vtkVolumeRayCastMapper* mMapper;
-    vtkVolume* mVolume;
+    vtkVolumeProperty                 *mVolumeProperty;
+    vtkVolumeRayCastCompositeFunction *mRayCastFunction;
+    vtkVolumeRayCastMapper            *mMapper;
+    vtkVolume                         *mVolume;
+    vtkVolumeProperty                 *_volumeProperty;
   };
    
   //=================================================================
@@ -103,10 +102,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,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);
   //=================================================================