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=e263b7ace0f53d647a731553a3f67700838ad146;hp=20244c046b5c0f3364ae1aa7c921f5099ab0af12;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;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 20244c0..5445592 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D_Plane.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "wxWidgetMesure2D_Plane.h"
 
 #include "vtkPlane2DView.h"
@@ -201,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();
@@ -228,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();
@@ -252,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();
@@ -276,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();