X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkVectorsVisu.cpp;h=92c3df40293c4ceac6970204482ccad1dbd404da;hb=ef9f90810fcc3800acac54a104f14ff505135fd3;hp=af6fe0d9c8eff54dbf9aaacf7a77d4112f494876;hpb=175699379042403d48be1c75d24a6aa9308eb2c1;p=creaVtk.git diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp index af6fe0d..92c3df4 100644 --- a/lib/creaVtk/vtkVectorsVisu.cpp +++ b/lib/creaVtk/vtkVectorsVisu.cpp @@ -51,16 +51,27 @@ vtkVectorsVisu::~vtkVectorsVisu() //------------------------------------------------------------------------------ void vtkVectorsVisu::Process() { -printf("EED vtkVectorsVisu::Process() start\n"); if(_active==true) { +#if VTK_MAJOR_VERSION <= 5 _vtkglyph->SetInput( GetDataObject() ); +#else + _vtkglyph->SetInputData( GetDataObject() ); +#endif if(GetTypeForm()==1) // source Arrow { +#if VTK_MAJOR_VERSION <= 5 _vtkglyph->SetSource( _vtkarrowsource->GetOutput() ); +#else + _vtkglyph->SetSourceData( _vtkarrowsource->GetOutput() ); +#endif } else { // source Line +#if VTK_MAJOR_VERSION <= 5 _vtkglyph->SetSource( _vtklinesource->GetOutput() ); +#else + _vtkglyph->SetSourceData( _vtklinesource->GetOutput() ); +#endif } _vtkglyph->SetScaleModeToScaleByVector(); @@ -68,7 +79,11 @@ printf("EED vtkVectorsVisu::Process() start\n"); _vtkglyph->SetScaleFactor( GetScaleFactor() ); _vtkglyph->Update(); +#if VTK_MAJOR_VERSION <= 5 _pdm->SetInput( _vtkglyph->GetOutput()); +#else + _pdm->SetInputData( _vtkglyph->GetOutput()); +#endif vtkPointData *data = _vtkglyph->GetOutput()->GetPointData(); //printf("EED -------------------------------------------\n"); @@ -126,7 +141,6 @@ for (i=0;i