X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=2bbf54205c3d2cb9b3e58a091ea1a840de45d107;hb=1709248f43dcb7745909d1d59109f553ee0ae700;hp=e09b38ad76babdbde24a6467eac2807a2d378957;hpb=4ae4c8a57a71c86165a9889e2569e249197f48c0;p=bbtk.git diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index e09b38a..2bbf542 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -105,6 +105,7 @@ void GetXCoherentInfoGdcmReader::Process() bbSetOutputOut( CreateDefaultImage() ); return; } // if res + // Get info from the first image file int i; std::vector v_iop; @@ -130,7 +131,7 @@ void GetXCoherentInfoGdcmReader::Process() // 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) @@ -146,7 +147,6 @@ void GetXCoherentInfoGdcmReader::Process() if (l==NULL) { - printf("EED GetXCoherentInfoGdcmReader::Process Warnning not coherent list/file \n"); return; } @@ -190,19 +190,22 @@ void GetXCoherentInfoGdcmReader::Process() } // for iitt bbSetOutputDicomInfo( vectormapinfodicom ); - if (reader!=NULL) - { - reader->Delete(); - 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(); - reader->GetOutput(); - bbSetOutputOut( reader->GetOutput() ); + if (bbGetInputReadRaw()==true) + { + if (reader!=NULL) + { + reader->Delete(); + 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(); + reader->GetOutput(); + bbSetOutputOut( reader->GetOutput() ); + } // if bGetInputReadRaw } #endif // endif USE_GDCM @@ -293,6 +296,7 @@ void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues() std::vector init; init.push_back(""); bbSetInputIn(init); + bbSetInputReadRaw(true); //reader=NULL; /// \TODO fixme JPR }