From ae867ce6752785393a3f4b209f3f76c46f04470c Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 24 Jun 2009 08:00:19 +0000 Subject: [PATCH] re-indent --- .../src/bbgdcmvtkGetInfoGdcmReader.cxx | 27 +++++----- .../bbgdcmvtkGetXCoherentInfoGdcmReader.cxx | 49 +++++++++---------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx index 42883f7..2e0a07e 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx @@ -31,6 +31,7 @@ void GetInfoGdcmReader::Process() std::vector v_iop; float iop[6]; f->GetImageOrientationPatient(iop); + for(i=0; i< 6; i++) v_iop.push_back(iop[i]); bbSetOutputIOP(v_iop ); @@ -38,6 +39,7 @@ void GetInfoGdcmReader::Process() std::vector v_ipp; float ipp[3]; f->GetImagePositionPatient(ipp); + for(i=0; i< 3; i++) v_ipp.push_back(ipp[i]); bbSetOutputIPP(v_ipp ); @@ -45,7 +47,9 @@ void GetInfoGdcmReader::Process() std::vector v_pixelspacing; v_pixelspacing.push_back(f->GetXSpacing()); v_pixelspacing.push_back(f->GetYSpacing()); - if (f->GetZSize() != 1) { + + if (f->GetZSize() != 1) + { v_pixelspacing.push_back(f->GetZSpacing()); } bbSetOutputPixelSpacing(v_pixelspacing); @@ -65,9 +69,9 @@ void GetInfoGdcmReader::Process() void GetInfoGdcmReader::bbUserSetDefaultValues() { - reader=NULL; - f=NULL; - bbSetInputIn(""); + reader=NULL; + f=NULL; + bbSetInputIn(""); } void GetInfoGdcmReader::bbUserInitializeProcessing() @@ -78,15 +82,16 @@ void GetInfoGdcmReader::bbUserInitializeProcessing() void GetInfoGdcmReader::bbUserFinalizeProcessing() { - if(reader){ + if( reader ) + { reader->Delete(); - reader=NULL; - } - if(f){ + reader=NULL; + } + if(f) + { f->Delete(); - f=NULL; - } - + f=NULL; + } } } diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index e638f0f..092a2a8 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -29,6 +29,7 @@ void GetXCoherentInfoGdcmReader::Process() std::vector v_iop; float iop[6]; f->GetImageOrientationPatient(iop); + for(i=0; i< 6; i++) v_iop.push_back(iop[i]); bbSetOutputIOP(v_iop ); @@ -36,14 +37,15 @@ void GetXCoherentInfoGdcmReader::Process() std::vector v_ipp; float ipp[3]; f->GetImagePositionPatient(ipp); + for(i=0; i< 3; i++) v_ipp.push_back(ipp[i]); bbSetOutputIPP(v_ipp ); - // Add *all the files* to the SerieHelper sh = GDCM_NAME_SPACE::SerieHelper::New(); std::vector gii = bbGetInputIn(); + for(std::vector::iterator it = gii.begin(); it != gii.end(); ++it) @@ -60,26 +62,23 @@ void GetXCoherentInfoGdcmReader::Process() int nbFiles; double zspacing = 0.; nbFiles = l->size() ; - sh->OrderFileList(l); + sh->OrderFileList(l); // this one should compute the *actual* Z Spacing! zspacing = sh->GetZSpacing(); - - std::vector v_pixelspacing; - v_pixelspacing.push_back( f->GetXSpacing() ); - v_pixelspacing.push_back( f->GetYSpacing() ); - v_pixelspacing.push_back( zspacing ); -// if (f->GetZSize() != 1) { -// v_pixelspacing.push_back(f->GetZSpacing()); -// } - bbSetOutputPixelSpacing(v_pixelspacing); - - - - if (reader!=NULL) - { - reader->Delete(); - reader=NULL; - } - reader = vtkGdcmReader::New(); + std::vector v_pixelspacing; + v_pixelspacing.push_back( f->GetXSpacing() ); + v_pixelspacing.push_back( f->GetYSpacing() ); + v_pixelspacing.push_back( zspacing ); +// if (f->GetZSize() != 1) { +// v_pixelspacing.push_back(f->GetZSpacing()); +// } + bbSetOutputPixelSpacing(v_pixelspacing); + + if (reader!=NULL) + { + reader->Delete(); + reader=NULL; + } + reader = vtkGdcmReader::New(); //reader->SetFileName( bbGetInputIn().c_str() ); reader->SetCoherentFileList(l); reader->Update(); @@ -90,10 +89,10 @@ void GetXCoherentInfoGdcmReader::Process() void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues() { - std::vector init; - init.push_back(""); - bbSetInputIn(init); - reader=NULL; + std::vector init; + init.push_back(""); + bbSetInputIn(init); + reader=NULL; } void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing() @@ -113,5 +112,3 @@ void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() } // EO namespace bbgdcmvtk - - -- 2.45.0