#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / lib / maracasVisuLib / src / CutModule / kernel / CutModelManager.cxx

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index bfd82ed15a33a240160200fba3c44687c5fa3e77..17c633a2d85df361d7174369edb3541c1f352e3f 100644 (file)
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.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: CutModelManager.cxx,v $
 Language:  C++
-Date:      $Date: 2010/04/02 07:22:25 $
-Version:   $Revision: 1.9 $
+Date:      $Date: 2012/11/15 14:15:48 $
+Version:   $Revision: 1.11 $
 
 Copyright: (c) 2002, 2003
 License:
@@ -142,7 +167,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;
@@ -177,9 +204,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();
@@ -291,7 +320,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;