#3120 BBTK Bug New Normal - merge branch changestoITK3and4 FROM master

[bbtk.git] / packages / std / src / bbstdReadColumnsInt.cxx

diff --git a/packages/std/src/bbstdReadColumnsInt.cxx b/packages/std/src/bbstdReadColumnsInt.cxx
index ec1452b70c32fc528c37a9a63e664de831c936a4..5a0c08a9fc9226431a55c08fee049c2afae95b9c 100644 (file)
--- a/packages/std/src/bbstdReadColumnsInt.cxx
+++ b/packages/std/src/bbstdReadColumnsInt.cxx
@@ -40,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]) ); }
@@ -79,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)