#3114 bbGEditor Bug New Normal - branch vtk7itk4 compilation with vtk7

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsVtkGUIEditorGraphic / vtkGBoxView.cxx

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx
index a8789d779f407038f2ff23a1107a7667307b8a75..4c6c7ee6d00d2f5ffc7b9096cc47112f017179d2 100644 (file)
--- 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();