From fbc0eece907d70ac484f613e6f3944adb40c5943 Mon Sep 17 00:00:00 2001
From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Fri, 7 Aug 2009 15:06:26 +0000
Subject: [PATCH] *** empty log message ***

---
 packages/vtk/src/bbvtkVolumeRenderer.cxx | 14 ++++++++++++--
 packages/vtk/src/bbvtkVolumeRenderer.h   |  6 ++++--
 packages/wxvtk/src/bbwxvtkViewer3D.cxx   | 22 ++++++++++++++++++----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index 3ebfe55..fb74afd 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/07/08 14:23:08 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/08/07 15:06:26 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -75,8 +75,18 @@ namespace bbvtk
     mRayCastFunction = vtkVolumeRayCastCompositeFunction::New();
     mMapper = vtkVolumeRayCastMapper::New();
 	   mMapper->SetVolumeRayCastFunction(mRayCastFunction);
+	   mMapper->AutoAdjustSampleDistancesOn();
+
+	   _volumeProperty = vtkVolumeProperty::New();	
+	_volumeProperty->SetInterpolationTypeToLinear();
+	_volumeProperty->ShadeOn();
+	_volumeProperty->DisableGradientOpacityOn();	
+	//_volumeProperty->SetColor(_ctfun);
+	//_volumeProperty->SetScalarOpacity(_tfun );
+
     mVolume = vtkVolume::New();
 	   mVolume->SetMapper(mMapper);
+	   mVolume->SetProperty(_volumeProperty );
 
     //  mMapper->ScalarVisibilityOff();
     //    mMapper->ImmediateModeRenderingOn();
diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index efaacb7..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: 2009/07/08 15:18:18 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/08/07 15:06:26 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -67,6 +67,7 @@
 #include "vtkColorTransferFunction.h"
 
 #include "bbvtk_EXPORT.h"
+#include "vtkVolumeProperty.h"
 
 namespace bbvtk
 {
@@ -93,6 +94,7 @@ namespace bbvtk
     vtkVolumeRayCastCompositeFunction * mRayCastFunction;
     vtkVolumeRayCastMapper* mMapper;
     vtkVolume* mVolume;
+	vtkVolumeProperty* _volumeProperty;
   };
    
   //=================================================================
diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 67df285..e697b6f 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/07/08 15:18:25 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2009/08/07 15:06:27 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -258,7 +258,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 		  {
 			  bbSetOutputRenderer( renderer );
 			  
-			  if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
+			  /*if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
 			  if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); }
 			  if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); }
 			  if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); }
@@ -266,13 +266,27 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 			  renderer->ResetCamera();
 			  double bounds[6];
 			  renderer->ComputeVisiblePropBounds(bounds);
-			  renderer->ResetCameraClippingRange(bounds);
+			  renderer->ResetCameraClippingRange(bounds);*/
 			  
 		  } // renderer
 		  
 		  		  
 	  } // w && firsttime
 
+	  if(bbGetOutputRenderer()!=NULL){
+		   vtkRenderer *renderer = w->GetRenderer();
+		  if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
+		  if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); }
+		  if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); }
+		  if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); }
+		  if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); }
+		  renderer->ResetCamera();
+		  double bounds[6];
+		  renderer->ComputeVisiblePropBounds(bounds);
+		  renderer->ResetCameraClippingRange(bounds);
+
+	  }
+
 	  if (w!=NULL)   w->Update();
 
   }
-- 
2.45.1