X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FPropagation.cxx;h=c6d2365481a9baa3806792f72baad6afc0ce0fb3;hb=4443a8fe2b4992b6abee8531917fd0803018fc12;hp=2ccb89be9cf32d151edda2b76c3acc5d5e8f7522;hpb=e59fe4a0a69ae0180c502e68c57faff544b935ca;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx
index 2ccb89b..c6d2365 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx
@@ -54,7 +54,7 @@ void Vector::copyVector( std::vector<Vector>*vec1, std::vector<Vector>*vec2 )
 	if( vec1->size() != 0 )
 	{
 		vec2->clear();
-		for(i=0; i<vec1->size(); i++)
+		for(i=0; i<(int)(vec1->size()); i++)
 		{
 			Vector *temp = new Vector();
 			temp->set_var( (*vec1)[i].get_var() );
@@ -71,7 +71,7 @@ void Vector::copyVector( std::vector<Vector>*vec1, std::vector<Vector>*vec2 )
 void Vector::printVector(std::vector<Vector>*vec1)
 {
 	int i,j;
-	for(i=0; i<vec1->size(); i++)
+	for(i=0; i<(int)(vec1->size()); i++)
 	{
 		printf("\n Pos (%d) => var = %f",i,(*vec1)[i].get_var());
 		for(j=0; j<(*vec1)[i].getsize_vec(); j++)
@@ -110,7 +110,7 @@ int Vector::get_plane()
 //------------------------------------------------------------------------------------------------------------------------------------------
 double Vector::get_x(int id)
 {
-	if( (-1<id) && (id<_vecX.size()) )
+	if( (-1<id) && (id<(int)(_vecX.size())  ) )
 	{
 		return _vecX[id];
 	}
@@ -128,7 +128,7 @@ int Vector::getsize_x()
 //------------------------------------------------------------------------------------------------------------------------------------------
 double Vector::get_y(int id)
 {
-	if( (-1<id) && (id<_vecY.size()) )
+	if( (-1<id) && (id<(int)(_vecY.size())) )
 	{
 		return _vecY[id];
 	}
@@ -155,7 +155,7 @@ int Vector::getsize_z()
 //------------------------------------------------------------------------------------------------------------------------------------------
 double Vector::get_z(int id)
 {
-	if( (-1<id) && (id<_vecZ.size()) )
+	if( (-1<id) && (id<(int)(_vecZ.size())) )
 	{
 		return _vecZ[id];
 	}
@@ -1119,7 +1119,7 @@ void PropContour::SetKeyContours(std::vector<double>*InX, std::vector<double>*In
 	}
 
 	_KeyContourSizes.insert( _KeyContourSizes.begin() + idKeyContourSizes , InX->size() );
-	for(i=0; i<InX->size(); i++)
+	for(i=0; i<(int)(InX->size()); i++)
 	{
 		_KeyContourX.insert( _KeyContourX.begin() + idKeyContour, (*InX)[i] );
 		_KeyContourY.insert( _KeyContourY.begin() + idKeyContour, (*InY)[i] );
@@ -1153,6 +1153,7 @@ vtkImageData* PropContour::CalculeSplinePropagation()
 	{
 		return method_Spline(&_KeyContourX,&_KeyContourY,&_KeyContourZ,&_KeyContourSizes);
 	}
+	return NULL;
 }
 //---------------------------------------------------------------------------------------------------
 void PropContour::GetKeyContours(std::vector<double>*KeyX, std::vector<double>*KeyY, std::vector<double>*KeyZ, std::vector<int>*KeyS)
@@ -1163,11 +1164,11 @@ void PropContour::GetKeyContours(std::vector<double>*KeyX, std::vector<double>*K
 	KeyZ->clear();
 	KeyS->clear();
 
-	for(i=0; i<_KeyContourSizes.size(); i++)
+	for(i=0; i<(int)(_KeyContourSizes.size()); i++)
 	{
 		KeyS->push_back( _KeyContourSizes[i] );
 	}
-	for(i=0; i<_KeyContourX.size(); i++)
+	for(i=0; i<(int)(_KeyContourX.size()); i++)
 	{
 		KeyX->push_back( _KeyContourX[i] );
 		KeyY->push_back( _KeyContourY[i] );
@@ -1179,7 +1180,7 @@ void PropContour::GetPropagatedContours( std::vector<Vector>*planevec )
 {
 	int i,j;
 	planevec->clear();
-	for(i=0; i<_planevector.size(); i++)
+	for(i=0; i<(int)(_planevector.size()); i++)
 	{
 		Vector *temp = new Vector();
 		temp->set_plane( _planevector[i].get_plane() );