X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRenderingManagerDataMhd.cxx;h=58a5db3e135886d61ad18016c8dcbd0aebecffe1;hb=acaa3bc3e713898cad44e2a3a40dcd4269bcc3a2;hp=cb6734ccdfb13f6c87cb0cbe20a08dd39789de07;hpb=641bab7ee015a554fa99e678d713d66273756557;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx index cb6734c..58a5db3 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx @@ -26,6 +26,7 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd _dataMapper->ImmediateModeRenderingOn(); vtkActor* dataActor = vtkActor::New(); + //if(_boxWidgetS1){ if(interactor){ _boxWidgetS1 = vtkBoxWidget::New(); @@ -34,10 +35,7 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd _boxWidgetS1->SetInput( this->_imagedata ); _boxWidgetS1->PlaceWidget(); - boxSurfaceObserver* observer = boxSurfaceObserver::New(); - - _boxWidgetS1->HandlesOn (); - _boxWidgetS1->On(); + boxSurfaceObserver* observer = boxSurfaceObserver::New(); vtkStripper* striper = vtkStripper::New(); striper->SetInput( _cleanFilter->GetOutput() ); @@ -47,6 +45,9 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd _boxWidgetS1->SetInput(striper->GetOutput()); _boxWidgetS1->PlaceWidget(); + _boxWidgetS1->HandlesOn (); + _boxWidgetS1->On(); + _tissuePlanes = vtkPlanes::New(); int x1,x2,y1,y2,z1,z2; @@ -67,7 +68,8 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd _boxWidgetS1->AddObserver( vtkCommand::InteractionEvent , observer ); - + _boxWidgetS1->HandlesOn (); + _boxWidgetS1->On(); }else{ _dataMapper->SetInput(_cleanFilter->GetOutput()); } @@ -83,13 +85,16 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd } -wxMaracasSurfaceRenderingManagerDataMhd::~wxMaracasSurfaceRenderingManagerDataMhd(){ + +wxMaracasSurfaceRenderingManagerDataMhd::~wxMaracasSurfaceRenderingManagerDataMhd() +{ _cubesFilter->Delete(); _cleanFilter->Delete(); _dataMapper->Delete(); } -void wxMaracasSurfaceRenderingManagerDataMhd::UpdateSurface(){ +void wxMaracasSurfaceRenderingManagerDataMhd::UpdateSurface() +{ _cubesFilter->Update(); _cleanFilter->Update(); _dataMapper->Update();