X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FKernel%2FVTKObjects%2FVolumeRenderer%2Fvolumerenderermanagerdata.cxx;h=ba1706c63b4298bc12540cddf4954d2cbc70ff9a;hb=649fc25e246b85f708b3e2ae8bb99ebc4941bf62;hp=70862f286994e40015a22f25b45c4d6b36869159;hpb=effe950c57bb076bb8aabe3d3bf533de83863913;p=creaMaracasVisu.git

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
index 70862f2..ba1706c 100644
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
@@ -86,7 +86,7 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
 
 	vtkVolumeMapper *volMapperTmp;
     if(usegpu && _vol->GetDataDimension() > 2){
-		#if (VTK_MAYOR_VERSION>=6 && VTK_MINOR_VERSION>=6)
+		#if (VTK_MAYOR_VERSION>=5 && VTK_MINOR_VERSION>=6)
 			_volumeMappergpu								= vtkGPUVolumeRayCastMapper::New();	
 			_volumeMappergpu->AutoAdjustSampleDistancesOn();
 			volMapperTmp									= _volumeMappergpu;
@@ -141,6 +141,7 @@ VolumeRendererManagerData::~VolumeRendererManagerData()
 void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* interactor)
 {
 //EED9Juin2011    if(_volumeMappergpu){
+    if(!_boxWidgetS1){
         _boxWidgetS1 = vtkBoxWidget::New();
         _boxWidgetS1->SetInteractor( interactor );
         _boxWidgetS1->SetPlaceFactor(1.01);
@@ -161,14 +162,17 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int
         callback->Delete();
         _boxWidgetS1->EnabledOn();
         _boxWidgetS1->GetSelectedFaceProperty()->SetOpacity(0.0);
+    }else{
+        _boxWidgetS1->EnabledOn();
+    }
 //EED9Juin2011  }
 }
 
 void VolumeRendererManagerData::DisableBoundingBox(){
     if(_boxWidgetS1){
         _boxWidgetS1->EnabledOff();
-        _boxWidgetS1->Delete();
-        _boxWidgetS1 = 0;
+        //_boxWidgetS1->Delete();
+        //_boxWidgetS1 = 0;
     }
 }