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=0900a392cfeec5501024922bb68b01cc3d8ed00e;hpb=e42ecf415793e6f85e5de98b41385fe53b6d00e0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx b/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx
index 0900a39..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"
 
@@ -9,7 +34,6 @@ PlaneDirectionManager::PlaneDirectionManager(int radio, double colour[3] , int o
 	_radio = radio;
 	_colour = colour;
 	_opacity = opacity;
-
 }
 
 
@@ -33,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
 	*/				
@@ -48,16 +75,16 @@ void PlaneDirectionManager::RemoveAllActorsFromIndex(int n)throw (std::exception
 		_render->RemoveViewProp(_vectdata[i]->GetActor());
 		delete _vectdata[i];
 		_vectdata.pop_back();
-	}
-	
+	}	
 }
 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);
@@ -76,37 +103,38 @@ 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{
 			_render->RemoveViewProp (_vectdata[index]->GetActor());
-		}
-		
-	}
-	
-	
+		}	
+	}	
 }
 
-void PlaneDirectionManager::changeColor(int index,double r,double g,double b){
+void PlaneDirectionManager::changeColor(int index,double r,double g,double b)
+{
     GetPlaneDirectionManagerData(index)->ChangeColour(r,g,b);
 }
 
-PlaneDirectionManagerData* PlaneDirectionManager::GetPlaneDirectionManagerData(int id) {
-
+PlaneDirectionManagerData* PlaneDirectionManager::GetPlaneDirectionManagerData(int id) 
+{
 	return _vectdata[id];
 }
 
 void PlaneDirectionManager::WriteInformation(std::string  filename, double* spc){
-    FILE *ff;	
+	FILE *ff;	
 	ff = fopen( filename.c_str() , "w+" );
 	if(spc ==NULL){
 		spc = new double[3];
@@ -115,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();
@@ -142,16 +171,13 @@ void PlaneDirectionManager::WriteInformation(std::string  filename, double* spc)
 			fprintf(ff,"Dir%d\n",i);
             fprintf(ff,"\tP0[%f, %f, %f]\tP1[%f, %f, %f]\tP2[%f, %f, %f]\tDir[%f, %f, %f] \n",
 							p0x,p0y,p0z,	p1x,p1y,p1z,	p2x,p2y,p2z,	dirx,diry,dirz);
-		}		
-		
+		}			
 		fclose(ff);
 	} else {   // else ff
 		printf("PlaneDirectionManager::WriteInformation  ...Error... creating file");
-	} //ff
-
-	
+	} //ff	
 }
 
 void  PlaneDirectionManager::SetArrowSize(int arrowsize){
     _radio = arrowsize;
-}
\ No newline at end of file
+}