X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FWidgetShowNPoints.cxx;h=2953844359ef8ae225d078ba9985b0fb0083e5c4;hb=04daf8279bb4bd4219f2903e7352e36db8d88866;hp=1f132b5b4d531179ec94316ad5710a8f64818578;hpb=c5bb8b228d6fcd2a4ea1d6210bfa3a39d6bcac33;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx index 1f132b5..2953844 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx @@ -215,6 +215,13 @@ void WidgetShowNPoints::RefreshPoint(int id) lstActorsSphere[id]->GetProperty()->SetOpacity( mopacity ); lstSourceSphere[id]->SetRadius( radio ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + // .. +#else + lstSourceSphere[id]->Update(); +#endif + lstActorsText[id]->SetInput( label.c_str() ); lstActorsText[id]->SetPosition( radio+spc[0]*x , spc[1]*y , spc[2]*z ); } @@ -241,7 +248,15 @@ void WidgetShowNPoints::AddVtkPoint() //NTU: For updating points lstSourceSphere.push_back(vtksphere); vtkPolyDataMapper *sphereMapper = vtkPolyDataMapper::New(); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 sphereMapper->SetInput( vtksphere->GetOutput() ); +#else + vtksphere->Update(); + sphereMapper->SetInputData( vtksphere->GetOutput() ); +#endif + vtkActor *sphereActor = vtkActor::New(); sphereActor->SetMapper(sphereMapper); sphereActor->SetOrigin(0, 0, 0);