#3230 vtk8itk4wx3-mingw64 MACOS

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxWidgetMesure2D_Plane.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
index 6ffd82d2dfe0c32f17d26bbc80aed4f29b2b86fe..3f47a4ebfe25ecee14691dcb17dd58730371fa12 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
@@ -226,8 +226,14 @@ void wxWidgetMesure2D_Plane::CircleLine()
        lines->Delete();  //do not delete lines ??
        _circle1Actor                                   =       vtkActor::New();
     _circle1Mapper                                     =       vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _circle1Mapper->SetInput(_pdCircle1);
        _circle1Mapper->ImmediateModeRenderingOn();
+#else
+       _circle1Mapper->SetInputData(_pdCircle1);
+#endif
        _circle1Actor->SetMapper(_circle1Mapper);
        _circle1Actor->GetProperty()->BackfaceCullingOn();
        _circle1Actor->GetProperty()->SetDiffuseColor(0,0,1);
@@ -253,8 +259,13 @@ void wxWidgetMesure2D_Plane::CircleLine()
        lines->Delete();  //do not delete lines ??
        _circle2Actor                                   =       vtkActor::New();
     _circle2Mapper                                     =       vtkPolyDataMapper::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _circle2Mapper->SetInput(_pdCircle2);
        _circle2Mapper->ImmediateModeRenderingOn();
+#else
+       _circle2Mapper->SetInputData(_pdCircle2);
+#endif
        _circle2Actor->SetMapper(_circle2Mapper);
        _circle2Actor->GetProperty()->BackfaceCullingOn();
        _circle2Actor->GetProperty()->SetDiffuseColor(0,0,1);
@@ -277,8 +288,15 @@ void wxWidgetMesure2D_Plane::CircleLine()
        lines->Delete();  //do not delete lines ??
        _lineRef1Actor                                  =       vtkActor::New();
     _lineRef1Mapper                                    =       vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _lineRef1Mapper->SetInput(_pdLineRef1);
        _lineRef1Mapper->ImmediateModeRenderingOn();
+#else
+       _lineRef1Mapper->SetInputData(_pdLineRef1);
+#endif
+
        _lineRef1Actor->SetMapper(_lineRef1Mapper);
        _lineRef1Actor->GetProperty()->BackfaceCullingOn();
        _lineRef1Actor->GetProperty()->SetDiffuseColor(0,0,1);
@@ -301,8 +319,15 @@ void wxWidgetMesure2D_Plane::CircleLine()
        lines->Delete();  //do not delete lines ??
        _lineRef2Actor                                  =       vtkActor::New();
     _lineRef2Mapper                                    =       vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _lineRef2Mapper->SetInput(_pdLineRef2);
        _lineRef2Mapper->ImmediateModeRenderingOn();
+#else
+       _lineRef2Mapper->SetInputData(_pdLineRef2);
+#endif
+
        _lineRef2Actor->SetMapper(_lineRef2Mapper);
        _lineRef2Actor->GetProperty()->BackfaceCullingOn();
        _lineRef2Actor->GetProperty()->SetDiffuseColor(0,0,1);