X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FPointView.cxx;h=7c17ffb89f0b09f299b72727a635b631a5f31fdf;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=77882a8932f3d9563e8c49139f2439f6de73bbe0;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/PointView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/PointView.cxx
index 77882a8..7c17ffb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/PointView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/PointView.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 "PointView.h"
 
 
@@ -46,7 +71,14 @@ void PointView::CreateNewPoint(double x, double y, int type)
 	point_mapped.push_back(vtkPolyDataMapper::New());
 //	point_mapped.back()->ImmediateModeRenderingOn();
 	//point_mapped.back()->ScalarVisibilityOff( );
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	point_mapped.back()->SetInput(aSphere->GetOutput());
+#else
+	point_mapped.back()->SetInputData(aSphere->GetOutput());
+#endif
 
 	point_actor.push_back(vtkActor::New());
 	point_actor.back()->SetMapper(point_mapped.back());