X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGComplexBoxPortView.cxx;h=902a2478cda2bd16bc122c7411f4ea50f74a39f4;hb=188d35adf90fa5479a00708eb3ae54eb25c66f5e;hp=88ce615e2ce216d4f03b063aff179ea6651c6498;hpb=db7d4391e42d1af64599a2bbdc79c5d688ce24da;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGComplexBoxPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGComplexBoxPortView.cxx index 88ce615..902a247 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGComplexBoxPortView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGComplexBoxPortView.cxx @@ -77,8 +77,9 @@ namespace bbtk { { } - //========================================================================= +/*EED Borrame + //========================================================================= void vtkGComplexBoxPortView::update( int idController , int command ) { updateColors( ) ; @@ -97,6 +98,7 @@ namespace bbtk { setRefreshWaiting( ) ; } +*/ //========================================================================= @@ -122,10 +124,12 @@ namespace bbtk { //EED _pts->SetPoint(1, xInic, yFin, zInic ); //EED _pts->SetPoint(2, xFin, yFin, zFin ); //EED _pts->SetPoint(3, xFin, yInic, zFin ); - _pts->SetPoint( 0 , -1000 , -1000 , -1000 ) ; - _pts->SetPoint( 1 , xInic , yFin , zInic ) ; - _pts->SetPoint( 2 , 1000 , 1000 , 1000 ) ; - _pts->SetPoint( 3 , xFin , yInic , zFin ) ; + +//EED 2017-03-02 +// _pts->SetPoint( 0 , -1000 , -1000 , -1000 ) ; +// _pts->SetPoint( 1 , xInic , yFin , zInic ) ; +// _pts->SetPoint( 2 , 1000 , 1000 , 1000 ) ; +// _pts->SetPoint( 3 , xFin , yInic , zFin ) ; // lines->InsertNextCell( 5 ) ; @@ -155,7 +159,15 @@ namespace bbtk { strip->InsertCellPoint( 3 ) ; 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( ) ; ///************************* FILL *************************