X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=c1d16ba58fb15afc84ccce9badb0f3705362fa51;hb=42286a16f16c8af07589bbbe30c157770b73bbb2;hp=5e927d075c4ac797505a16f5c0ba35ead05cc871;hpb=871fd8609dc04c99003add6f8477a25789e41cc8;p=bbtk.git diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index 5e927d0..c1d16ba 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -1,3 +1,29 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la SantÈ) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + #include "bbgdcmvtkGetXCoherentInfoGdcmReader.h" #include "bbgdcmvtkPackage.h" @@ -22,19 +48,64 @@ namespace bbgdcmvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(gdcmvtk,GetXCoherentInfoGdcmReader) BBTK_BLACK_BOX_IMPLEMENTATION(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox); + + +vtkImageData* GetXCoherentInfoGdcmReader::CreateDefaultImage() +{ + int i; + int sizeX, sizeY, sizeZ; + sizeX = 200; + sizeY = sizeX; + sizeZ = 1; + vtkImageData *newImage = vtkImageData::New(); + newImage->Initialize(); + newImage->SetSpacing( 1,1,1 ); + newImage->SetDimensions( sizeX,sizeY,sizeZ ); + newImage->SetExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + newImage->SetWholeExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 ); + newImage->SetScalarTypeToUnsignedChar(); + newImage->SetNumberOfScalarComponents(1); + newImage->AllocateScalars(); + newImage->Update(); +#else + newImage->AllocateScalars(VTK_UNSIGNED_CHAR,1); +#endif + + memset ( (void*)newImage->GetScalarPointer(), 0, sizeX*sizeY*1 ); + for (i=0; iSetScalarComponentFromDouble(i,i,0, 0, 255 ); + newImage->SetScalarComponentFromDouble(i,sizeY-1-i,0, 0, 255 ); + } // for i + return newImage; +} + + #if defined USE_GDCM void GetXCoherentInfoGdcmReader::Process() { + // Read the *first* image file (a SET of file names is given as input) f = GDCM_NAME_SPACE::File::New(); - f->SetFileName( bbGetInputIn()[0] ); + + if ( bbGetInputIn().size()!=0 ) + { + f->SetFileName( bbGetInputIn()[0] ); + } else { + f->SetFileName( "" ); + } // if + bool res = f->Load(); if ( !res ) { - f->Delete(); - bbSetOutputOut(0); - return; - } + printf("EED GetXCoherentInfoGdcmReader::Process resultImage NULL\n"); + f->Delete(); + bbSetOutputOut( CreateDefaultImage() ); + return; + } // if res // Get info from the first image file int i; std::vector v_iop; @@ -42,7 +113,9 @@ void GetXCoherentInfoGdcmReader::Process() f->GetImageOrientationPatient(iop); for(i=0; i< 6; i++) + { v_iop.push_back(iop[i]); + } // for i bbSetOutputIOP(v_iop ); std::vector v_ipp; @@ -50,7 +123,9 @@ void GetXCoherentInfoGdcmReader::Process() f->GetImagePositionPatient(ipp); for(i=0; i< 3; i++) + { v_ipp.push_back(ipp[i]); + } // for i bbSetOutputIPP(v_ipp ); // Add *all the files* to the SerieHelper @@ -62,7 +137,8 @@ void GetXCoherentInfoGdcmReader::Process() ++it) { sh->AddFileName(*it); - } + } //for vector + GDCM_NAME_SPACE::FileList::const_iterator it; GDCM_NAME_SPACE::FileList *l; @@ -71,10 +147,10 @@ void GetXCoherentInfoGdcmReader::Process() l = sh->GetFirstSingleSerieUIDFileSet(); int nbFiles; - double zspacing = 0.; - nbFiles = l->size() ; + double zspacing = 0.; + nbFiles = l->size() ; sh->OrderFileList(l); // this one should compute the *actual* Z Spacing! - zspacing = sh->GetZSpacing(); + zspacing = sh->GetZSpacing(); std::vector v_pixelspacing; v_pixelspacing.push_back( f->GetXSpacing() ); v_pixelspacing.push_back( f->GetYSpacing() ); @@ -83,18 +159,20 @@ void GetXCoherentInfoGdcmReader::Process() // v_pixelspacing.push_back(f->GetZSpacing()); // } bbSetOutputPixelSpacing(v_pixelspacing); - if (reader!=NULL) { reader->Delete(); - reader=NULL; + 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(); +printf("EED GetXCoherentInfoGdcmReader::Process \n"); bbSetOutputOut( reader->GetOutput() ); } #endif @@ -105,16 +183,18 @@ 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()); + reader->SetFileName( bbGetInputIn()[0].c_str() ); bool res = read->Read(); - if ( !res ) - { - delete read; - bbSetOutputOut(0); - return; - } + if ( !res ) + { + delete read; + bbSetOutputOut(NULL); + return; + } + + // Get info from the first image file const gdcm::File &f = read->GetFile(); int i; @@ -125,7 +205,9 @@ void GetXCoherentInfoGdcmReader::Process() gdcm::Element iop; iop.Read( ss ); for(i=0; i< 6; i++) - v_iop.push_back((float)(iop[i])); + { + v_iop.push_back((float)(iop[i])); + } bbSetOutputIOP(v_iop ); std::vector v_ipp; @@ -133,8 +215,10 @@ void GetXCoherentInfoGdcmReader::Process() deIpp.GetValue().Print(ss); gdcm::Element ipp; ipp.Read( ss ); - for(i=0; i< 3; i++) + for(i=0; i< 3; i++) + { v_ipp.push_back((float)(ipp[i])); + } // for 3 bbSetOutputIPP(v_ipp ); // Add *all the files* to the IPPsorter @@ -172,7 +256,6 @@ void GetXCoherentInfoGdcmReader::Process() } reader->SetFileNames(files); reader->Update(); - reader->GetOutput(); bbSetOutputOut( reader->GetOutput() ); } #endif @@ -195,11 +278,17 @@ void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing() void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() { if(reader) + { reader->Delete(); + } // if reader if(f) + { f->Delete(); + } // if f if(sh) + { sh->Delete(); + } // if sh } #endif @@ -207,7 +296,9 @@ void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing() { if(reader) + { reader->Delete(); + } } #endif