X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FPlaneDirectionManager.cxx;h=6cd2047a0705943a27f2bec54ea426d262657668;hb=1e7de89ec5e380426c57ee4e85c6a5ccd5aa44ad;hp=0a95f5c7f3e627c36d1686be97b4c19cea15e2a4;hpb=062ae799e283a7de038b13d78eaf7d8495086378;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx b/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx index 0a95f5c..6cd2047 100644 --- a/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx +++ b/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ */ + #include "PlaneDirectionManager.h" @@ -32,11 +57,14 @@ void PlaneDirectionManager::UpdateDirections() throw (std::exception){ AddActors(); } + void PlaneDirectionManager::AddActors(){ - for(int i = 0; i < _vectdata.size();i++){ + int i; + for(i = 0; i < (int)_vectdata.size();i++){ _render->AddViewProp (_vectdata[i]->GetActor()); } } + void PlaneDirectionManager::RemoveAllActorsFromIndex(int n)throw (std::exception){ /*due to incompleate set of points to create the plane */ @@ -53,9 +81,10 @@ void PlaneDirectionManager::UpdateVectors()throw (std::exception){ PlaneDirectionManagerData* temp; bool deletelast = false; int currentdata = 0; - for(int i = 0; i < _lstPointsx.size();i++){ + int i; + for(i = 0; i < (int)_lstPointsx.size();i++){ if(i % 3 == 0){ - if(_vectdata.size()>currentdata){ + if((int)_vectdata.size()>currentdata){ temp = _vectdata[currentdata]; }else{ temp = new PlaneDirectionManagerData(_radio, _colour, _opacity); @@ -74,15 +103,18 @@ void PlaneDirectionManager::UpdateVectors()throw (std::exception){ RemoveAllActorsFromIndex(currentdata); } -void PlaneDirectionManager::UpdateActors(){ - for(int i = 0; i < _vectdata.size();i++){ +void PlaneDirectionManager::UpdateActors() +{ + int i; + for(i = 0; i < (int)_vectdata.size();i++) + { _vectdata[i]->UpdateActor(); } } -void PlaneDirectionManager::addRemoveActor(int index, bool addremove){ - - if(index < _vectdata.size()){ +void PlaneDirectionManager::addRemoveActor(int index, bool addremove) +{ + if(index < (int)_vectdata.size()){ if(addremove){ _render->AddViewProp (_vectdata[index]->GetActor()); }else{ @@ -111,8 +143,9 @@ void PlaneDirectionManager::WriteInformation(std::string filename, double* spc) spc[2] = 1; } if (ff!=NULL) - { - for(int i = 0; i < _vectdata.size();i++){ + { + int i; + for(i = 0; i < (int)_vectdata.size();i++){ double* p0 = _vectdata[i]->getPoint0(); double* p1 = _vectdata[i]->getPoint1();