X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FPlaneDirectionManagerData.cxx;h=a42b0e54d9cc528accad1a90cc0b5825722b1ba9;hb=f9901e756bb82bd333310b47607875331616bb29;hp=e6f613395b632f5f1c66f7e0f8de9ca1d02061fc;hpb=e42ecf415793e6f85e5de98b41385fe53b6d00e0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/PlaneDirectionManagerData.cxx b/lib/maracasVisuLib/src/kernel/PlaneDirectionManagerData.cxx
index e6f6133..a42b0e5 100644
--- a/lib/maracasVisuLib/src/kernel/PlaneDirectionManagerData.cxx
+++ b/lib/maracasVisuLib/src/kernel/PlaneDirectionManagerData.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 "PlaneDirectionManagerData.h"
 
@@ -9,33 +34,40 @@ PlaneDirectionManagerData::PlaneDirectionManagerData(int radio, double colour[3]
 :PlanesOperations(){	
 	_vtkarrow		= vtkArrowSource::New();	
 	_arrowMapper	= vtkPolyDataMapper::New();
-	_arrowActor	= vtkActor::New();
+	_arrowActor		= vtkActor::New();
 
 	_vtkarrow->SetTipResolution(30);
 	_vtkarrow->SetShaftResolution( 30  );	
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_arrowMapper->SetInput( _vtkarrow->GetOutput() );	
+#else
+	_arrowMapper->SetInputData( _vtkarrow->GetOutput() );	
+#endif
+
 	_arrowActor->SetMapper(_arrowMapper);	
 
-	_radio = radio;
-	_colour = colour;
-	_opacity = opacity;
-
-	p0 = new double[3];
-	p0[0] = 0;
-	p0[1] = 0;
-	p0[2] = 0;
-	p1 = new double[3];
-	p1[0] = 0;
-	p1[1] = 0;
-	p1[2] = 0;
-	p2 = new double[3];
-	p2[0] = 1;
-	p2[1] = 1;
-	p2[2] = 1;
-	_dir = new double[3];
-	_dir[0] = 0;
-	_dir[1] = 0;
-	_dir[2] = 0;
+	_radio 			= radio;
+	_colour 		= colour;
+	_opacity 		= opacity;
+
+	p0 				= new double[3];
+	p0[0] 			= 0;
+	p0[1] 			= 0;
+	p0[2] 			= 0;
+	p1 				= new double[3];
+	p1[0] 			= 0;
+	p1[1] 			= 0;
+	p1[2] 			= 0;
+	p2 				= new double[3];
+	p2[0] 			= 1;
+	p2[1] 			= 1;
+	p2[2] 			= 1;
+	_dir 			= new double[3];
+	_dir[0] 		= 0;
+	_dir[1] 		= 0;
+	_dir[2] 		= 0;
 }