X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FKernel%2FVTKObjects%2FVolumeRenderer%2Fvolumerenderermanagerdata.cxx;h=0075422951d6234b07881efdf57e8354408fdede;hb=a236b3d0da0e436f9027b701df86c3576e9c25fe;hp=d72471869f5ff6c9eb190052f845d031d85bd360;hpb=42e68172d460b71190e5d9811cffe7131e86eb72;p=creaMaracasVisu.git

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
index d724718..0075422 100644
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
@@ -27,12 +27,12 @@ VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, vtkRende
 }
 
 VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, bool usegpu, std::string dataname){
-    Initialize(vol, dataname, usegpu);    
+    Initialize(vol, dataname, usegpu);
 }
 
 void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string dataname, bool usegpu){
     _vol = vol;
-    _dataname = dataname;    
+    _dataname = dataname;
 
     _tfun = vtkPiecewiseFunction::New();
     _ctfun = vtkColorTransferFunction::New();
@@ -56,9 +56,9 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
     _MIPFunction = 0;
     _boxWidgetS1 = 0;
 
-	
-	
-/* EED9Juin2011	
+
+
+/* EED9Juin2011
     if(usegpu && _vol->GetDataDimension() > 2){
         _volumeMappergpu = vtkGPUVolumeRayCastMapper::New();
         _volumeMappergpu->SetClippingPlanes( _volumePlanes );
@@ -87,7 +87,7 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
 	vtkVolumeMapper *volMapperTmp;
     if(usegpu && _vol->GetDataDimension() > 2){
 		#if (VTK_MAYOR_VERSION>=5 && VTK_MINOR_VERSION>=6)
-			_volumeMappergpu								= vtkGPUVolumeRayCastMapper::New();	
+			_volumeMappergpu								= vtkGPUVolumeRayCastMapper::New();
 			_volumeMappergpu->AutoAdjustSampleDistancesOn();
 			volMapperTmp									= _volumeMappergpu;
 		#else
@@ -106,7 +106,7 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
 		_volumeMapper->AutoAdjustSampleDistancesOn();
 		volMapperTmp									= _volumeMapper;
     }
-	
+
 	volMapperTmp->SetClippingPlanes( _volumePlanes );
 	_newvol->SetMapper(volMapperTmp );
 	volMapperTmp->SetInput( _vol );
@@ -151,13 +151,13 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int
         _boxWidgetS1->PlaceWidget();
 
         vtkBoxWidgetCallback *callback = vtkBoxWidgetCallback::New();
-	
+
 		if (_volumeMapper!=0){
 			callback->SetMapper(_volumeMapper);
 		} else {
 			callback->SetMapper(_volumeMappergpu);
-		} 
-	
+		}
+
         _boxWidgetS1->AddObserver(vtkCommand::InteractionEvent, callback);
         callback->Delete();
         _boxWidgetS1->EnabledOn();
@@ -288,8 +288,9 @@ void VolumeRendererManagerData::SetLookupTable(vtkLookupTable* lookuptable){
      for(int i = 0; i < colort->GetSize(); i++){
          double val[6];
          colort->GetNodeValue(i, val);
-         //cout<< val[0]<<" "<< val[1]<<" "<<val[2]<<" "<< val[3]<<endl;
+         cout<< "JPRG::VolumeRendererManagerData::SetLookupTable::"<<val[0]<<" "<< val[1]<<" "<<val[2]<<" "<< val[3]<<endl;
          _ctfun->AddRGBPoint(val[0], val[1], val[2], val[3]);
      }
      _newvol->Update();
+
 }