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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
index 9f3af99..1bb56ae 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: UtilVtk3DGeometriSelection.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:54:34 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/03/01 11:11:01 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -113,8 +113,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 +145,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 ];