X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.cxx;h=901a7d7d4c6bb1f5aaa518917c3ef17d57b3b1a7;hb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;hp=e5b8804e0550d26b847db84dc98c057a63ad86ec;hpb=40dfa1616e1203ecccb8163e7722c76769eddfe3;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx index e5b8804..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,8 +255,6 @@ void vtkClipping3DDataViewer::Configure_Volume() _volumeProperty->Delete(); }*/ - - _tfun = vtkPiecewiseFunction::New(); _ctfun = vtkColorTransferFunction::New(); @@ -266,8 +262,6 @@ void vtkClipping3DDataViewer::Configure_Volume() this->_vtkmprbasedata->GetImageData()->GetScalarRange(range); double max = range[1]; - printf("EED::vtkClipping3DDataViewer::Configure_Volume max=%f \n",max); - /* adding the poinst of the transference function */ @@ -328,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(); @@ -351,17 +339,9 @@ void vtkClipping3DDataViewer::Configure_Volume() _volumeProperty->SetScalarOpacity( _tfun ); // EED 31/03/2008 - _volumeProperty->DisableGradientOpacityOn(); - -// _ - - -// _ - - // _volumeProperty->SetInterpolationTypeToNearest(); // _volumeProperty->ShadeOff(); // _volumeProperty->SetAmbient(0.3); @@ -373,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 ); @@ -382,25 +362,18 @@ void vtkClipping3DDataViewer::Configure_Volume() void vtkClipping3DDataViewer::Configure_VolumeBox() { - cout<<"EED::JPRG::vtkClipping3DDataViewer::Configure_VolumeBox() start"<SetImageData(_vtkmprbasedata->GetImageData()); vector *gv = this->GetGreyValuesTransferenceFVector(); vector *op = this->GetIntensityValuesTransferenceFVector(); - printf("EED::vtkClipping3DDataViewer::Configure_VolumeBox _ctfun=%p \n",_ctfun); - - _volumerendererdata->SetLookUpTable((vtkLookupTable*)(_ctfun)); _volumerendererdata->OpacityChanged(*gv, *op); //_wxvtkclipping3Dview->VisibleVolumeActor( false ); //_volumerendererdata->ShowVolume(event.IsChecked() ); //_volumerendererdata->BoundingBoxChanged(event.IsChecked() ); - - cout<<"EED::JPRG::vtkClipping3DDataViewer::Configure_VolumeBox() end"<