X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuReadAxisTree3D.cxx;h=2f42c2cefed359beb40c10c1a9e271e9320c5df5;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=317c922ef2ada0f64d9009e3c68022a45710f120;hpb=bde42c285a4385c4995ab816d8fd9ec704da97d6;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuReadAxisTree3D.cxx b/bbtk/src/bbcreaMaracasVisuReadAxisTree3D.cxx
index 317c922..2f42c2c 100644
--- a/bbtk/src/bbcreaMaracasVisuReadAxisTree3D.cxx
+++ b/bbtk/src/bbcreaMaracasVisuReadAxisTree3D.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.
+# ------------------------------------------------------------------------ */
+
 //===== 
 // Don't edit this file. This file is generated from xml description.. 
 //===== 
@@ -32,7 +57,8 @@ void ReadAxisTree3D::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-
+	printf("EED ReadAxisTree3D::Process start \n");
+	
 	std::vector< std::vector<std::string> * > tlst;
 	
 	int i;
@@ -57,11 +83,29 @@ void ReadAxisTree3D::Process()
 			}	
 			numberOfLines++;			
 		}	
+
+		std::cout<<"18-04-2012 RaC ReadAxisTree3D::Process Erase last element in vectors."<<std::endl;
+		// TOFIX If it is not erased, the last element in every vector is a copy of the last column value
+		for( i=0 ;  i<bbGetInputDimension() ; i++)
+		{
+			vecData=tlst[i];
+			vecData->pop_back();
+		}
+		/* vecData=tlst[0];
+		std::cout<<"RaC last element 1:"<<vecData->at(numberOfLines-2)<<std::endl;
+		std::cout<<"RaC last element 1:"<<vecData->at(numberOfLines-1)<<std::endl;
+		vecData=tlst[1];
+		std::cout<<"RaC last element 2:"<<vecData->at(numberOfLines-2)<<std::endl;
+		std::cout<<"RaC last element 2:"<<vecData->at(numberOfLines-1)<<std::endl;
+		vecData=tlst[2];
+		std::cout<<"RaC last element 3:"<<vecData->at(numberOfLines-2)<<std::endl;
+		std::cout<<"RaC last element 3:"<<vecData->at(numberOfLines-1)<<std::endl; */
 		fclose(ff1);
 	} else {   // else ff1
 		printf("bbcreaMaracasVisuReadAxisTree3D::Process  ...Error... reading file InputFileName_Points>%s", bbGetInputFileName().c_str() );
 	} //ff1	
 
+
 	i=1; if (i<=bbGetInputDimension()) { bbSetOutputlstData1( *(tlst[i-1]) ); }
 	i=2; if (i<=bbGetInputDimension()) { bbSetOutputlstData2( *(tlst[i-1]) ); }
 	i=3; if (i<=bbGetInputDimension()) { bbSetOutputlstData3( *(tlst[i-1]) ); }
@@ -71,6 +115,8 @@ void ReadAxisTree3D::Process()
 	i=7; if (i<=bbGetInputDimension()) { bbSetOutputlstData7( *(tlst[i-1]) ); }
 	i=8; if (i<=bbGetInputDimension()) { bbSetOutputlstData8( *(tlst[i-1]) ); }
 	i=9; if (i<=bbGetInputDimension()) { bbSetOutputlstData9( *(tlst[i-1]) ); }
+
+	printf("EED ReadAxisTree3D::Process end \n");
 	
 }