X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FLineView.cxx;h=253fa58ab8f1e021f41c8308b5ea309b9c76b8f0;hb=f9901e756bb82bd333310b47607875331616bb29;hp=f8060a731f83f8915a52a17af89d2443a3431851;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/LineView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/LineView.cxx
index f8060a7..253fa58 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/LineView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/LineView.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 "LineView.h"
@@ -60,9 +85,14 @@ void LineView::CreateNewLine(double x1, double y1, double z1, double x2, double
 	aLineGrid->Allocate(1,1);
 	aLineGrid->InsertNextCell(aLine->GetCellType(),aLine->GetPointIds());
 	aLineGrid->SetPoints(pointsLine);
-
 	
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	contour_mapped.back()->SetInput(aLineGrid);
+#else
+	contour_mapped.back()->SetInputData(aLineGrid);
+#endif
+
 	contour_mapped.back()->ImmediateModeRenderingOn();
 
 	contour_actor.back()->SetMapper(contour_mapped.back());