X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.cxx;h=901a7d7d4c6bb1f5aaa518917c3ef17d57b3b1a7;hb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;hp=d2524bed7c192c2cbb5c9b92c9591903ef09899c;hpb=afeeee6e8ef4a7b29e33db89bf6fc03542201ed1;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx index d2524be..901a7d7 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx @@ -248,8 +248,6 @@ void vtkClipping3DDataViewer::Configure_Volume() { // Volume - - /** if(_newvol != NULL) { _newvol->Delete(); @@ -257,15 +255,13 @@ void vtkClipping3DDataViewer::Configure_Volume() _volumeProperty->Delete(); }*/ - - _tfun = vtkPiecewiseFunction::New(); _ctfun = vtkColorTransferFunction::New(); double range[2]; this->_vtkmprbasedata->GetImageData()->GetScalarRange(range); double max = range[1]; - + /* adding the poinst of the transference function */ @@ -326,20 +322,14 @@ void vtkClipping3DDataViewer::Configure_Volume() // EED 13/03/2011 - - // _volumeMapper = vtkVolumeRayCastMapper::New(); _volumeMapper->SetInput( this->GetVtkMPRBaseData()->GetImageData() ); - - _volumeMapper->SetVolumeRayCastFunction(_compositeFunction); - // _volumeMapper->SetVolumeRayCastFunction(_compositeFunctionMIP); - + // - _volumeMapper->SetClippingPlanes( _volumePlanes ); _volumeMapper->AutoAdjustSampleDistancesOn(); @@ -349,17 +339,9 @@ void vtkClipping3DDataViewer::Configure_Volume() _volumeProperty->SetScalarOpacity( _tfun ); // EED 31/03/2008 - _volumeProperty->DisableGradientOpacityOn(); - -// _ - - -// _ - - // _volumeProperty->SetInterpolationTypeToNearest(); // _volumeProperty->ShadeOff(); // _volumeProperty->SetAmbient(0.3); @@ -371,7 +353,7 @@ void vtkClipping3DDataViewer::Configure_Volume() _newvol->SetMapper(_volumeMapper ); _newvol->SetProperty(_volumeProperty ); - _observerV = boxSurfaceObserver::New(); + _observerV = boxSurfaceObserver::New(); _observerV->SetPlanes( _volumePlanes ); _observerV->SetActor( _newvol ); _observerV->SetvtkVolumeRayCastMapper( _volumeMapper ); @@ -380,15 +362,12 @@ void vtkClipping3DDataViewer::Configure_Volume() void vtkClipping3DDataViewer::Configure_VolumeBox() { - cout<<"JPRG::vtkClipping3DDataViewer::Configure_VolumeBox()"<SetImageData(_vtkmprbasedata->GetImageData()); vector *gv = this->GetGreyValuesTransferenceFVector(); vector *op = this->GetIntensityValuesTransferenceFVector(); - _volumerendererdata->SetLookUpTable((vtkLookupTable*)(_ctfun)); _volumerendererdata->OpacityChanged(*gv, *op);