X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxWidgetMesure2D_Plane.cxx;h=54455923c47dc0c8860715b62ae408fb475bf99c;hb=201c9ad0b300530ef664356626a529aa4d73863c;hp=6ffd82d2dfe0c32f17d26bbc80aed4f29b2b86fe;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
index 6ffd82d..5445592 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
@@ -226,7 +226,13 @@ 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);
+#else
+	_circle1Mapper->SetInputData(_pdCircle1);
+#endif
 	_circle1Mapper->ImmediateModeRenderingOn();
 	_circle1Actor->SetMapper(_circle1Mapper);
 	_circle1Actor->GetProperty()->BackfaceCullingOn();
@@ -253,7 +259,12 @@ 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);
+#else
+	_circle2Mapper->SetInputData(_pdCircle2);
+#endif
 	_circle2Mapper->ImmediateModeRenderingOn();
 	_circle2Actor->SetMapper(_circle2Mapper);
 	_circle2Actor->GetProperty()->BackfaceCullingOn();
@@ -277,7 +288,14 @@ 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);
+#else
+	_lineRef1Mapper->SetInputData(_pdLineRef1);
+#endif
+
 	_lineRef1Mapper->ImmediateModeRenderingOn();
 	_lineRef1Actor->SetMapper(_lineRef1Mapper);
 	_lineRef1Actor->GetProperty()->BackfaceCullingOn();
@@ -301,7 +319,14 @@ 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);
+#else
+	_lineRef2Mapper->SetInputData(_pdLineRef2);
+#endif
+
 	_lineRef2Mapper->ImmediateModeRenderingOn();
 	_lineRef2Actor->SetMapper(_lineRef2Mapper);
 	_lineRef2Actor->GetProperty()->BackfaceCullingOn();