X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=1ec74e201efc89186624198ffc0e69459bdd3cb2;hb=bf1bdd88621c0556024de37768c2d17d12f2a265;hp=092a2a834c1df10f6d009a4d8024c6adb66b0f16;hpb=ae867ce6752785393a3f4b209f3f76c46f04470c;p=bbtk.git diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index 092a2a8..1ec74e2 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -2,16 +2,27 @@ #include "bbgdcmvtkPackage.h" #include "gdcmFile.h" -#include "gdcmFileHelper.h" #include "vtkImageData.h" -#include "vtkGdcmReader.h" #include +#if defined USE_GDCM + #include "gdcmFileHelper.h" +#endif + +#if defined USE_GDCM2 + #include + #include + #include + #include + #include "vtkStringArray.h" +#endif + namespace bbgdcmvtk { BBTK_ADD_BLACK_BOX_TO_PACKAGE(gdcmvtk,GetXCoherentInfoGdcmReader) BBTK_BLACK_BOX_IMPLEMENTATION(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox); +#if defined USE_GDCM void GetXCoherentInfoGdcmReader::Process() { // Read the *first* image file (a SET of file names is given as input) @@ -79,6 +90,11 @@ void GetXCoherentInfoGdcmReader::Process() reader=NULL; } reader = vtkGdcmReader::New(); + + //EED 21 mars 2012 FLIP probleme ..PLOP.. + reader->SetFlipY(false); + + //reader->SetFileName( bbGetInputIn().c_str() ); reader->SetCoherentFileList(l); reader->Update(); @@ -86,13 +102,93 @@ void GetXCoherentInfoGdcmReader::Process() bbSetOutputOut( reader->GetOutput() ); } +#endif +// endif USE_GDCM + +#if defined USE_GDCM2 +void GetXCoherentInfoGdcmReader::Process() +{ + // Read the *first* image file (a SET of file names is given as input) + gdcm::Reader *read = new gdcm::Reader(); + reader->SetFileName( bbGetInputIn()[0].c_str()); + + bool res = read->Read(); + if ( !res ) + { + delete read; + bbSetOutputOut(0); + return; + } + + // Get info from the first image file + const gdcm::File &f = read->GetFile(); + int i; + std::vector v_iop; + const gdcm::DataElement &deIop = f.GetDataSet().GetDataElement(gdcm::Tag(0x0020, 0x0037)); + std::stringstream ss; + deIop.GetValue().Print(ss); + gdcm::Element iop; + iop.Read( ss ); + for(i=0; i< 6; i++) + v_iop.push_back((float)(iop[i])); + bbSetOutputIOP(v_iop ); + + std::vector v_ipp; + const gdcm::DataElement &deIpp = f.GetDataSet().GetDataElement(gdcm::Tag((0x0020,0x0032))); + deIpp.GetValue().Print(ss); + gdcm::Element ipp; + ipp.Read( ss ); + for(i=0; i< 3; i++) + v_ipp.push_back((float)(ipp[i])); + bbSetOutputIPP(v_ipp ); + +// Add *all the files* to the IPPsorter + gdcm::IPPSorter s; + s.SetComputeZSpacing( true ); + s.SetZSpacingTolerance( 1e-3 ); + std::vector gii = bbGetInputIn(); + s.Sort(gii); + + //l = sh->GetFirstSingleSerieUIDFileSet(); + // no Test if we have multiple series + //s.GetFilenames(); + //int nbFiles; + + double zspacing = 0.; + zspacing = s.GetZSpacing(); + std::vector v_pixelspacing = gdcm::ImageHelper::GetSpacingValue(f); + v_pixelspacing.push_back( v_pixelspacing[0] ); + v_pixelspacing.push_back( v_pixelspacing[1] ); + v_pixelspacing.push_back( zspacing ); + bbSetOutputPixelSpacing(v_pixelspacing); + + if (reader!=NULL) + { + reader->Delete(); + reader=NULL; + } + reader = vtkGDCMImageReader::New(); + vtkStringArray *files = vtkStringArray::New(); + std::vector< std::string >::const_iterator it = s.GetFilenames().begin(); + for( ; it != s.GetFilenames().end(); ++it) + { + const std::string &f = *it; + files->InsertNextValue( f.c_str() ); + } + reader->SetFileNames(files); + reader->Update(); + reader->GetOutput(); + bbSetOutputOut( reader->GetOutput() ); +} +#endif +// endif USE_GDCM2 void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues() { std::vector init; init.push_back(""); bbSetInputIn(init); - reader=NULL; + //reader=NULL; /// \TODO fixme JPR } void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing() @@ -100,6 +196,7 @@ void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing() } +#if defined USE_GDCM void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() { if(reader) @@ -109,6 +206,15 @@ void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() if(sh) sh->Delete(); } +#endif + +#if defined USE_GDCM2 +void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() +{ + if(reader) + reader->Delete(); +} +#endif } // EO namespace bbgdcmvtk