X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FUtilVtk3DGeometriSelection.cxx;h=b6bc2c6ff10e1eaadc9dc27a06d9e0e5035e99aa;hb=e263b7ace0f53d647a731553a3f67700838ad146;hp=1cd27c580dbcef8a7dfcdbe80e897f96c8babe3c;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
index 1cd27c5..b6bc2c6 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: UtilVtk3DGeometriSelection.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:41 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/15 14:14:35 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -113,8 +138,8 @@ bool UtilVtk3DGeometriSelection::FindCubePointsFromPoints( double* pO, double* p
 	c( 2 ) = ( double )_depth  / 2.0;
 
 	// Sort with bubble sort. Only 30 iterations!
-	for( i = 0; i < points.size( ); i++ ) {
-	    for( j = 0; j < points.size( ) - 1; j++ ) {
+	for( i = 0; i <(int) (points.size( )); i++ ) {
+	    for( j = 0; j < (int)(points.size( )) - 1; j++ ) {
 
 		d1 = ( c - *points[ j ] ).GetNorm( );
 		d2 = ( c - *points[ j + 1 ] ).GetNorm( );
@@ -145,7 +170,13 @@ bool UtilVtk3DGeometriSelection::FindCubePointsFromPoints( double* pO, double* p
 bool UtilVtk3DGeometriSelection::GetPointAndNormalIntersection( double* p, double* n, double* pO, double* pF )
 {
     gtm::TVector< double > n1( 3 ), n2( 3 ), n3( 3 );
-    int subId, cellId, returnVal;
+
+	//EED 01/03/2010
+	//int     cellId,
+	vtkIdType cellId;
+
+    	int subId,  returnVal;
+
     double t, pcoords[ 3 ], x[ 3 ];
     double fpO[ 3 ], fpF[ 3 ];
     double p1[ 3 ], p2[ 3 ], p3[ 3 ];