X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGBoxView.cxx;fp=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGBoxView.cxx;h=4c6c7ee6d00d2f5ffc7b9096cc47112f017179d2;hb=204fc70d152f2c46eea9d21bc2616ccfb2226e8e;hp=a8789d779f407038f2ff23a1107a7667307b8a75;hpb=511369e67cf26244fc8768a727a03f42ff42865f;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx index a8789d7..4c6c7ee 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx @@ -136,7 +136,14 @@ namespace bbtk pdTrianglesInputs->SetPoints( _TrianglesInputsPts ); pdTrianglesInputs->SetStrips( stripTrianglesInputs ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 _TrianglesInputsPolyMapper->SetInput( pdTrianglesInputs ); +#else + _TrianglesInputsPolyMapper->SetInputData( pdTrianglesInputs ); +#endif + _TrianglesInputsActor->SetMapper(_TrianglesInputsPolyMapper); _TrianglesInputsPolyMapper->Modified(); @@ -174,7 +181,14 @@ namespace bbtk pdTrianglesOutputs->GetCellData()->SetScalars( _cellDataOutputTriangles ); pdTrianglesOutputs->SetPoints( _TrianglesOutputsPts ); pdTrianglesOutputs->SetStrips( stripTrianglesOutputs ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 _TrianglesOutputsPolyMapper->SetInput( pdTrianglesOutputs ); +#else + _TrianglesOutputsPolyMapper->SetInputData( pdTrianglesOutputs ); +#endif + _TrianglesOutputsActor->SetMapper(_TrianglesOutputsPolyMapper); _TrianglesOutputsPolyMapper->Modified(); ///************************* Inputs Fill (triangles) ************************* @@ -243,7 +257,12 @@ namespace bbtk pdFill->SetPoints( _pts ); pdFill->SetStrips( strip ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 _fillPolyMapper->SetInput(pdFill); +#else + _fillPolyMapper->SetInputData(pdFill); +#endif _fillObjectActor->SetMapper(_fillPolyMapper); _fillPolyMapper->Modified();