From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Wed, 8 Jul 2009 14:23:08 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~13
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4743efc603c9eeac3b8bc509b5112a76d12b1375;p=bbtk.git

*** empty log message ***
---

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index 0273d3c..3ebfe55 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkVolumeRenderer.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:01 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/07/08 14:23:08 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -113,12 +113,21 @@ namespace bbvtk
 	 mMapper->SetInput( bbGetInputIn() );
 	 changed = true;
        }
-     if ( ( bbGetInputStatus("ColorFunction") != bbtk::UPTODATE ) &&
+
+	   if ( ( bbGetInputStatus("ColorFunction") != bbtk::UPTODATE ) &&
 	  ( bbGetInputColorFunction() != 0 ) )
        {
 	 mVolume->GetProperty()->SetColor( bbGetInputColorFunction() );
 	 changed = true;
        }
+
+     if ( ( bbGetInputStatus("ColorFunction1") != bbtk::UPTODATE ) &&
+	  ( bbGetInputColorFunction1() != 0 ) )
+       {
+	 mVolume->GetProperty()->SetColor( bbGetInputColorFunction1() );
+	 changed = true;
+       }
+
      if ( ( bbGetInputStatus("OpacityFunction") != bbtk::UPTODATE ) &&
 	  ( bbGetInputOpacityFunction() != 0 ) )
        {
diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index fc46e65..e431b06 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: 2009/05/15 14:58:01 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/07/08 14:23:08 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -79,6 +79,7 @@ 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);
@@ -101,6 +102,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*,"");