X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdReadColumnsInt.cxx;h=5a0c08a9fc9226431a55c08fee049c2afae95b9c;hb=f707cd7054d48f29fa0e6e3b47fb152b0ea324e8;hp=c2e6308a9f1e6fa1f407de170524a994dbea5386;hpb=63eefb309c710654480ed9e5241e4eff8d21911a;p=bbtk.git

diff --git a/packages/std/src/bbstdReadColumnsInt.cxx b/packages/std/src/bbstdReadColumnsInt.cxx
index c2e6308..5a0c08a 100644
--- a/packages/std/src/bbstdReadColumnsInt.cxx
+++ b/packages/std/src/bbstdReadColumnsInt.cxx
@@ -1,4 +1,31 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 #include "bbstdReadColumnsInt.h"
@@ -13,37 +40,35 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ReadColumnsInt,bbtk::AtomicBlackBox);
 //===== 
 void ReadColumnsInt::Process()
 {
-	printf("EED ReadColumnsDouble::Process start \n");
-	
-	std::vector< std::vector<int> * > tlst;
-	
+	std::vector< std::vector<int> * > tlst;	
 	int i;
 	for( i=0 ;  i<bbGetInputDimension() ; i++)
 	{
 		tlst.push_back( new std::vector<int> );
 	}	
-	
 	int numberOfLines = 0;
-	char tmpValue[50];
+	char tmpValue[1000];
 	std::vector<int> *vecData;
-	FILE *ff1 = fopen( bbGetInputFileName().c_str() , "r+" );
+	FILE *ff1 = fopen( bbGetInputFileName().c_str() , "r" );
 	if (ff1!=NULL)
 	{
+                if (!feof(ff1))
+                        fscanf(ff1,"%s",tmpValue);
+
 		while (!feof(ff1))
 		{
 			for( i=0 ;  i<bbGetInputDimension() ; i++)
 			{
-				fscanf(ff1,"%s",tmpValue);
 				vecData=tlst[i];
 				vecData->push_back( atoi(tmpValue) );
+				fscanf(ff1,"%s",tmpValue);
 			}	
 			numberOfLines++;			
 		}	
 		fclose(ff1);
 	} else {   // else ff1
-		printf("bbcreaMaracasVisuReadAxisTree3D::Process  ...Error... reading file InputFileName_Points>%s", bbGetInputFileName().c_str() );
+		printf("ReadColumnsDouble::Process  ...Error... reading file FileName <%s>\n", 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]) ); }
@@ -52,10 +77,7 @@ void ReadColumnsInt::Process()
 	i=6; if (i<=bbGetInputDimension()) { bbSetOutputlstData6( *(tlst[i-1]) ); }
 	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 ReadColumnsDouble::Process end \n");
-	
+	i=9; if (i<=bbGetInputDimension()) { bbSetOutputlstData9( *(tlst[i-1]) ); }	
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)