X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Fkernel%2FCutModelManager.cxx;h=53139eafc0baceee6ec4e91af4793c48021c0900;hb=1e74c6a806cb7f396fd6c5016c6803c391c466d7;hp=23fdee919684fd55f50cd605c4693fb95dff47a1;hpb=c016f2efd20188d031f0bc29c5a2bb1aab959adf;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index 23fdee9..53139ea 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
@@ -3,8 +3,8 @@
 Program:   wxMaracas
 Module:    $RCSfile: CutModelManager.cxx,v $
 Language:  C++
-Date:      $Date: 2010/02/24 13:56:08 $
-Version:   $Revision: 1.7 $
+Date:      $Date: 2010/09/29 21:21:05 $
+Version:   $Revision: 1.10 $
 
 Copyright: (c) 2002, 2003
 License:
@@ -15,6 +15,8 @@ PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
 #include "CutModelManager.h"
+
+//Machete
 #include "CutModelMainPanel.h"
 
 /**
@@ -140,7 +142,9 @@ void CutModelManager::ChangeShape(int id,int selection)throw( CutModelException)
 CutModelData* CutModelManager::getCutModelData(int id)throw( CutModelException){
 
 	CutModelData* current = NULL;
-	for(int i= 0; i < _vectordata.size();i++){
+	int i;
+	for(i= 0; i < (int)_vectordata.size();i++)
+	{
 		CutModelData* temp = _vectordata[i];
 		std::cout<<"id in CutModelManager:: "<<id<<std::endl;
 		std::cout<<"vectordataid in CutModelManager:: "<<temp->getId()<<std::endl;
@@ -175,9 +179,11 @@ void CutModelManager::RemoveActor(int id)throw( CutModelException){
 	checkInvariant();
 
 	CutModelData* current = getCutModelData(id);
-	for(int i = 0; i < _vectordata.size()-1;i++){
+	int i,j;
+	for(i = 0; i < (int)_vectordata.size()-1;i++)
+	{
 		if(_vectordata[i]->getId()==id){				
-			for(int j = i; j < _vectordata.size()-1;j++){
+			for(j = i; j < (int)_vectordata.size()-1;j++){
 				_vectordata[j]=_vectordata[j+1];
 			}
 			i = _vectordata.size();
@@ -289,7 +295,7 @@ int CutModelManager::Undo()	throw( CutModelException){
 
 int CutModelManager::Redo()	throw( CutModelException){
 
-	if(_currentaction >= 0 && _currentaction < _undoredo.size()){
+	if(_currentaction >= 0 && _currentaction < (int)_undoredo.size()){
 
 		CutModelSaveBinInfo* currentundo = _undoredo[_currentaction];
 		CutModelData* currentmodel;
@@ -355,7 +361,7 @@ void CutModelManager::UpdatePolygon(bool mode)
 
 			_polygonCutter = new CutModelPolygon();
 
-			cout<<"RaC ContourDrawer::Update Printing points"<<endl;
+			cout<<"RaC Printing points......"<<endl;
 			for(int t=0;t<numPoints;t++)
 			{
 				double point[3];