X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdReadColumnsDouble.cxx;h=ca3dd76be41105337377f09a2f51270f0f0a1959;hb=f707cd7054d48f29fa0e6e3b47fb152b0ea324e8;hp=ed0e9a69fde3e5d527c8bbc2dda39068f8f1a58a;hpb=8adfd489f76b4f237107e989e8200b40dceb00a6;p=bbtk.git

diff --git a/packages/std/src/bbstdReadColumnsDouble.cxx b/packages/std/src/bbstdReadColumnsDouble.cxx
index ed0e9a6..ca3dd76 100644
--- a/packages/std/src/bbstdReadColumnsDouble.cxx
+++ b/packages/std/src/bbstdReadColumnsDouble.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 "bbstdReadColumnsDouble.h"
@@ -12,30 +39,29 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ReadColumnsDouble,bbtk::AtomicBlackBox);
 // 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)
 //===== 
 void ReadColumnsDouble::Process()
-{
-	printf("EED ReadColumnsDouble::Process start \n");
-	
-	std::vector< std::vector<double> * > tlst;
-	
+{	
+	std::vector< std::vector<double> * > tlst;	
 	int i;
 	for( i=0 ;  i<bbGetInputDimension() ; i++)
 	{
 		tlst.push_back( new std::vector<double> );
 	}	
-	
 	int numberOfLines = 0;
-	char tmpValue[50];
+	char tmpValue[1000];
 	std::vector<double> *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( atof(tmpValue) );
+                                fscanf(ff1,"%s",tmpValue);
 			}	
 			numberOfLines++;			
 		}	
@@ -59,11 +85,6 @@ void ReadColumnsDouble::Process()
 	i=13; if (i<=bbGetInputDimension()) { bbSetOutputlstData13( *(tlst[i-1]) ); }
 	i=14; if (i<=bbGetInputDimension()) { bbSetOutputlstData14( *(tlst[i-1]) ); }
 	i=15; if (i<=bbGetInputDimension()) { bbSetOutputlstData15( *(tlst[i-1]) ); }
-	
-	
-	printf("EED ReadColumnsDouble::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)