*** empty log message ***

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index 3ebfe55ddbe611969348be5d71cb750b68e46ac0..fb74afdc75e94887f9154d3e96548557540cc2b2 100644 (file)
--- 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 efaacb789461f85d0c9d77001b575ac72bff96dc..296f955d6110aaeae03d6fc44a0242f7f1fc46b7 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: 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 67df2857932a885a202ca5e5bb518460bdab53f6..e697b6fe7dc20647aeaed2d2daa63152c5ccd9b8 100644 (file)
--- 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();
 
   }