From 29a64ec37c5dc46cc05277a4f7358a77026bfbda Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 14 Jun 2016 13:06:40 +0200 Subject: [PATCH] #2975 BBTK Bug New Normal - Clean comments --- .../itk/src/bbitkBinaryThresholdImageFilter.h | 2 -- packages/std/src/bbstdFilesFromDirectory.cxx | 4 --- packages/std/src/bbstdReadColumnsDouble.cxx | 14 ++-------- packages/std/src/bbstdReadColumnsInt.cxx | 12 ++------ packages/std/src/bbstdWriteColumnsString.cxx | 28 ++----------------- packages/vtk/src/bbvtkImageGaussianSmooth.xml | 2 -- packages/vtk/src/bbvtkTransform.cxx | 5 +--- 7 files changed, 8 insertions(+), 59 deletions(-) diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h index 0fa8e97..dcc7ecd 100644 --- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h +++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h @@ -204,7 +204,6 @@ namespace bbitk template void BinaryThresholdImageFilterGeneric::Process() { -printf("EED BinaryThresholdImageFilterGeneric::Process Start\n"); bbtkDebugMessageInc("Core",9, "bbitk::BinaryThresholdImageFilterGeneric::Process<" <()<<">()"<bbSetOutputOut( f->bbGetOutputOut() ); bbtkDebugDecTab("Core",9); -printf("EED BinaryThresholdImageFilterGeneric::Process End\n"); } //=================================================== diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx index 5f8feb3..6712c8c 100644 --- a/packages/std/src/bbstdFilesFromDirectory.cxx +++ b/packages/std/src/bbstdFilesFromDirectory.cxx @@ -47,8 +47,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(FilesFromDirectory,bbtk::AtomicBlackBox); void FilesFromDirectory::Process() { -printf("EED FilesFromDirectory::Process Start\n"); - Filenames.clear(); SimpleFilenames.clear(); DirName = bbGetInputIn(); @@ -57,8 +55,6 @@ printf("EED FilesFromDirectory::Process Start\n"); CleanFilenames( bbGetInputIn() ); bbSetOutputOut(Filenames); bbSetOutputOutSimple(SimpleFilenames); - -printf("EED FilesFromDirectory::Process End\n"); } void FilesFromDirectory::bbUserSetDefaultValues() diff --git a/packages/std/src/bbstdReadColumnsDouble.cxx b/packages/std/src/bbstdReadColumnsDouble.cxx index 915990f..42815ce 100644 --- a/packages/std/src/bbstdReadColumnsDouble.cxx +++ b/packages/std/src/bbstdReadColumnsDouble.cxx @@ -39,17 +39,14 @@ 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 * > tlst; - +{ +printf("EED ReadColumnsDouble::Process UPS \n"); + std::vector< std::vector * > tlst; int i; for( i=0 ; i ); } - int numberOfLines = 0; char tmpValue[1000]; std::vector *vecData; @@ -89,11 +86,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) diff --git a/packages/std/src/bbstdReadColumnsInt.cxx b/packages/std/src/bbstdReadColumnsInt.cxx index f33d735..e860d23 100644 --- a/packages/std/src/bbstdReadColumnsInt.cxx +++ b/packages/std/src/bbstdReadColumnsInt.cxx @@ -40,16 +40,12 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ReadColumnsInt,bbtk::AtomicBlackBox); //===== void ReadColumnsInt::Process() { - printf("EED ReadColumnsDouble::Process start \n"); - - std::vector< std::vector * > tlst; - + std::vector< std::vector * > tlst; int i; for( i=0 ; i ); } - int numberOfLines = 0; char tmpValue[1000]; std::vector *vecData; @@ -73,7 +69,6 @@ void ReadColumnsInt::Process() } else { // else ff1 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]) ); } @@ -82,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) diff --git a/packages/std/src/bbstdWriteColumnsString.cxx b/packages/std/src/bbstdWriteColumnsString.cxx index 05b760b..229601c 100644 --- a/packages/std/src/bbstdWriteColumnsString.cxx +++ b/packages/std/src/bbstdWriteColumnsString.cxx @@ -13,19 +13,11 @@ BBTK_BLACK_BOX_IMPLEMENTATION(WriteColumnsString,bbtk::AtomicBlackBox); //===== void WriteColumnsString::Process() { - - std::cout << "MLER WriteColumnsString::Process Start " << std::endl; - - std::ofstream write_fi; - write_fi.open(bbGetInputFileName().c_str()); - + write_fi.open(bbGetInputFileName().c_str()); std::vector headers = bbGetInputHeaders(); //Headers Input bool onHeaders = bbGetInputOnHeaders(); - - std::vector > values; - values.push_back(bbGetInputlstData1()); values.push_back(bbGetInputlstData2()); values.push_back(bbGetInputlstData3()); @@ -35,10 +27,7 @@ void WriteColumnsString::Process() values.push_back(bbGetInputlstData7()); values.push_back(bbGetInputlstData8()); values.push_back(bbGetInputlstData9()); - std::vector >::iterator it; - - std::cout << "values size"< 
-    printf("EED ImageGaussianSmooth::Process start a\n");
     bbGetVtkObject()->SetStandardDeviation(bbGetInputStdDevX(), 
                      			bbGetInputStdDevY(), 
                      			bbGetInputStdDevZ());
     bbGetVtkObject()->Modified();
     bbGetVtkObject()->Update();
-    printf("EED ImageGaussianSmooth::Process end \n");
diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx index 84aaddf..fd0d369 100644 --- a/packages/vtk/src/bbvtkTransform.cxx +++ b/packages/vtk/src/bbvtkTransform.cxx @@ -80,6 +80,7 @@ namespace bbvtk } } + // -------------------------------------------------------------- void Transform::Process() { @@ -89,13 +90,11 @@ namespace bbvtk result->Concatenate( bbGetInputIn()->GetMatrix() ); } - if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3)) { double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0]; double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1]; double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2]; -printf("Transform::Process() %f %f %f\n",tx, ty,tz); result->Translate(tx,ty,tz); } @@ -108,8 +107,6 @@ printf("Transform::Process() %f %f %f\n",tx, ty,tz); { result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]); } - - bbSetOutputOut(result); } -- 2.44.0