X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdReadColumnsString.cxx;h=2860219d384957e978256e26e9ff3744bc0c10a8;hb=84454af9be8cecfbf41ca7c0198c65efe60f9b48;hp=f6cd0a7bc6d45465c00bbb88743a23223051c1a3;hpb=63eefb309c710654480ed9e5241e4eff8d21911a;p=bbtk.git

diff --git a/packages/std/src/bbstdReadColumnsString.cxx b/packages/std/src/bbstdReadColumnsString.cxx
index f6cd0a7..2860219 100644
--- a/packages/std/src/bbstdReadColumnsString.cxx
+++ b/packages/std/src/bbstdReadColumnsString.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 "bbstdReadColumnsString.h"
@@ -17,28 +44,31 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ReadColumnsString,bbtk::AtomicBlackBox);
 //===== 
 void ReadColumnsString::Process()
 {
-
-	printf("EED ReadColumnsString::Process start \n");
-	
-	std::vector< std::vector<std::string> * > tlst;
-	
+	std::vector< std::vector<std::string> * > tlst;	
 	int i;
 	for( i=0 ;  i<bbGetInputDimension() ; i++)
 	{
 		tlst.push_back( new std::vector<std::string> );
 	}	
-	
+	int iSkipLines;
 	int numberOfLines = 0;
-	char tmpValue[50];
+	char tmpValue[500];
 	std::vector<std::string> *vecData;
-	FILE *ff1 = fopen( bbGetInputFileName().c_str() , "r+" );
+	FILE *ff1 = fopen( bbGetInputFileName().c_str() , "r" );
 	if (ff1!=NULL)
 	{
+		for (iSkipLines=0;iSkipLines<bbGetInputSkipLines(); iSkipLines++ )
+      	{
+         	fgets( tmpValue , 500, ff1 ); 
+      	}
+
 		while (!feof(ff1))
 		{
 			for( i=0 ;  i<bbGetInputDimension() ; i++)
 			{
-				fscanf(ff1,"%s",tmpValue);
+				//EED Big careful not meesing the space caracter!!!
+//				fscanf(ff1,"%s",tmpValue);    // this line is not working in linux!
+				fscanf(ff1,"%s ",tmpValue);
 				vecData=tlst[i];
 				vecData->push_back( tmpValue );
 			}	
@@ -59,8 +89,6 @@ void ReadColumnsString::Process()
 	i=8; if (i<=bbGetInputDimension()) { bbSetOutputlstData8( *(tlst[i-1]) ); }
 	i=9; if (i<=bbGetInputDimension()) { bbSetOutputlstData9( *(tlst[i-1]) ); }
 	
-	printf("EED ReadColumnsString::Process end \n");
-	
 }
 //===== 
 // 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)
@@ -70,6 +98,7 @@ void ReadColumnsString::bbUserSetDefaultValues()
 
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
+	bbSetInputSkipLines(0);	
 	bbSetInputDimension(1);	
 	bbSetInputFileName("");