X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=2064640f10f4b4d6af75d68d432c2a966664767c;hb=95681d23548434adecc6b7bcd11e487b00ef6216;hp=6a01b9041faab88f618a916b8b98e268ae82d95e;hpb=4cf608c37695b2385eebeb1426ca8cc87f1c8108;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 6a01b904..2064640f 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2005/10/20 08:53:21 $ - Version: $Revision: 1.65 $ + Date: $Date: 2006/03/29 16:15:01 $ + Version: $Revision: 1.80 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,7 +30,7 @@ #include "gdcmOrientation.h" #include -// TODO : code factorization, for 'sigle file' an 'whole directory' processing +// TODO : code factorization, for 'single file' an 'whole directory' processing void ShowLutData(gdcm::File *f); @@ -49,7 +49,6 @@ void ShowLutData(gdcm::File *f) std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002); if ( /*lutDescriptor == GDCM_UNFOUND*/ 0 ) { - //gdcmWarningMacro( "LUT Descriptor is missing" ); std::cout << "LUT Descriptor is missing" << std::endl; return; } @@ -68,8 +67,7 @@ void ShowLutData(gdcm::File *f) << std::endl; if ( nbRead != 3 ) { - //gdcmWarningMacro( "Wrong LUT descriptor" ); - std::cout << "Wrong LUT descriptor" << std::endl; + std::cout << "Wrong LUT descriptor" << std::endl; } //LUT Data (CTX dependent) gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); @@ -128,9 +126,11 @@ int main(int argc, char *argv[]) " Display the header of a ACR-NEMA/PAPYRUS/DICOM File ", " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]", " [forceload=listOfElementsToForceLoad] ", - " [dict= privateDirectory] ", - " [ { [noshadowseq] | [noshadow][noseq] } ] [debug] ", + " [4DLoc= ][dict= privateDirectory] ", + " [ { [noshadowseq] | [noshadow][noseq] } ] ", + " [debug] [warning] ", " level = 0,1,2 : depending on the amount of details user wants to see", + " 4DLoc: group-elem(in hexa, no space) of the DataEntry holdind 4thDim", " listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)", " of Elements to load whatever their length ", " privateDirectory : source file full path name of Shadow Group elems ", @@ -138,6 +138,7 @@ int main(int argc, char *argv[]) " noshadow : user doesn't want to load Private groups (odd number) ", " noseq : user doesn't want to load Sequences ", " debug : user wants to run the program in 'debug mode' ", + " warning : user wants to be warned about any oddity in the File ", " showlut :user wants to display the Palette Color (as an int array) ", FINISH_USAGE @@ -151,8 +152,8 @@ int main(int argc, char *argv[]) return 1; } - char *fileName = am->ArgMgrGetString("filein",(char *)0); - char *dirName = am->ArgMgrGetString("dirin",(char *)0); + const char *fileName = am->ArgMgrGetString("filein"); + const char *dirName = am->ArgMgrGetString("dirin"); if ( (fileName == 0 && dirName == 0) || (fileName != 0 && dirName != 0) ) @@ -167,13 +168,16 @@ int main(int argc, char *argv[]) if (am->ArgMgrDefined("debug")) gdcm::Debug::DebugOn(); - + + if (am->ArgMgrDefined("warning")) + gdcm::Debug::WarningOn(); + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) loadMode |= gdcm::LD_NOSHADOWSEQ; else { - if ( am->ArgMgrDefined("noshadow") ) + if ( am->ArgMgrDefined("noshadow") ) loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) loadMode |= gdcm::LD_NOSEQ; @@ -184,15 +188,29 @@ int main(int argc, char *argv[]) int forceLoadNb; uint16_t *elemsToForceLoad = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb); + + int nbP; + uint16_t *FourthDimLoc; + if ( am->ArgMgrDefined("4DLoc") ) + { + FourthDimLoc = am->ArgMgrGetXInt16Enum("4DLoc", &nbP); + + if (nbP != 1) + { + std::cout << "4DLoc must have 2 and only 2 components!" << std::endl; + delete am; + return 1; + } + } bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") ); bool ddict = am->ArgMgrDefined("dict") ? true : false; - char *dict = 0; + const char *dict = 0; if (ddict) { - dict = am->ArgMgrGetString("dict",(char *)0); + dict = am->ArgMgrGetString("dict",0); } /* if unused Param we give up */ @@ -215,11 +233,7 @@ int main(int argc, char *argv[]) if ( fileName != 0 ) // ====== Deal with a single file ====== { - // gdcm::File::IsReadable() is no usable here, because we deal with - // any kind of gdcm-Parsable *document* - // not only gdcm::File (as opposed to gdcm::DicomDir) - - gdcm::File *f = new gdcm::File(); + gdcm::File *f = gdcm::File::New(); f->SetLoadMode(loadMode); f->SetFileName( fileName ); @@ -228,8 +242,17 @@ int main(int argc, char *argv[]) f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], (uint32_t)elemsToForceLoad[2*ri+1] ); } +// TODO : find why such a polution +// To avoid polluting the output with messages +// 'Last system error was : No such file or directory' + +errno = 0; + bool res = f->Load(); + // gdcm::File::IsReadable() is no usable here, because we deal with + // any kind of gdcm-Parsable *document* + // not only gdcm::File (as opposed to gdcm::DicomDir) if ( !res ) { std::cout << "Cannot process file [" << fileName << "]" << std::endl; @@ -239,11 +262,13 @@ int main(int argc, char *argv[]) << std::endl; std::cout << "use 'PrintFile filein=... debug' to try to guess the pb" << std::endl; - delete f; + f->Delete(); return 0; } + if (nbP == 1) + f->SetFourthDimensionLocation(FourthDimLoc[0],FourthDimLoc[1]); - gdcm::FileHelper *fh = new gdcm::FileHelper(f); + gdcm::FileHelper *fh = gdcm::FileHelper::New(f); fh->SetPrintLevel( level ); fh->Print(); @@ -254,24 +279,30 @@ int main(int argc, char *argv[]) std::cout <<" dataSize " << fh->GetImageDataSize() << std::endl; std::cout <<" dataSizeRaw " << fh->GetImageDataRawSize() << std::endl; - int nX,nY,nZ,sPP,planarConfig; + int nX,nY,nZ,nT,sPP,planarConfig; std::string pixelType; nX=f->GetXSize(); nY=f->GetYSize(); nZ=f->GetZSize(); - std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ + nT=f->GetTSize(); + std::cout << " DIMX=" << nX << " DIMY=" << nY + << " DIMZ=" << nZ << " DIMT=" << nT << std::endl; pixelType = f->GetPixelType(); sPP = f->GetSamplesPerPixel(); - planarConfig = f->GetPlanarConfiguration(); - std::cout << " pixelType= [" << pixelType << "] SamplesPerPixel= [" << sPP - << "] PlanarConfiguration= [" << planarConfig - << "] "<< std::endl - << " PhotometricInterpretation= [" - << f->GetEntryString(0x0028,0x0004) + << "] "; + + if (sPP == 3) + { + planarConfig = f->GetPlanarConfiguration(); + std::cout << " PlanarConfiguration= [" << planarConfig + << "] "<< std::endl; + } + std::cout << " PhotometricInterpretation= [" + << f->GetEntryString(0x0028,0x0004) << "] "<< std::endl; int numberOfScalarComponents=f->GetNumberOfScalarComponents(); @@ -286,6 +317,7 @@ int main(int argc, char *argv[]) std::cout << "Transfer Syntax not loaded. " << std::endl << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" << std::endl; + f->Delete(); return 0; } @@ -342,22 +374,23 @@ int main(int argc, char *argv[]) // Let's compute 'user friendly' results about 'Orientation' // --------------------------------------------------------- - gdcm::Orientation o; + gdcm::Orientation *o = gdcm::Orientation::New(); if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND || strImageOrientationRET != gdcm::GDCM_UNFOUND ) { - gdcm::OrientationType orient = o.GetOrientationType( f ); + gdcm::OrientationType orient = o->GetOrientationType( f ); std::cout << "TypeOrientation = " << orient << " (-> " - << o.GetOrientationTypeString(orient) << " )" << std::endl; + << o->GetOrientationTypeString(orient) << " )" << std::endl; } - std::string ori = o.GetOrientation ( f ); + std::string ori = o->GetOrientation ( f ); if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; + o->Delete(); //------------------------------ @@ -378,7 +411,7 @@ int main(int argc, char *argv[]) gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem(); if ( !sqi ) { - std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002); + std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002); int length; // LUT length in Bytes int deb; // Subscript of the first Lut Value int nbits; // Lut item size (in Bits) @@ -389,7 +422,6 @@ int main(int argc, char *argv[]) &length, &deb, &nbits ); if ( nbRead != 3 ) { - //gdcmWarningMacro( "Wrong LUT descriptor" ); std::cout << "Wrong LUT descriptor" << std::endl; } gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); @@ -435,13 +467,8 @@ int main(int argc, char *argv[]) ShowLutData(f); } - //if( !f->gdcm::Document::IsReadable()) - // Try downcast to please MSVC - if ( !((gdcm::Document *)f)->IsReadable() ) - { - std::cout <IsReadable() ) { std::cout <Delete(); + fh->Delete(); } else // ====== Deal with a Directory ====== { @@ -473,13 +500,14 @@ int main(int argc, char *argv[]) gdcm::DirListType fileList = dirList.GetFilenames(); gdcm::File *f; bool res; + for( gdcm::DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { std::cout << std::endl<<" Start processing :[" << it->c_str() << "]" << std::endl; - f = new gdcm::File(); + f = gdcm::File::New(); f->SetLoadMode(loadMode); f->SetFileName( it->c_str() ); @@ -503,11 +531,11 @@ int main(int argc, char *argv[]) std::cout << "use 'PrintFile filein=... debug' " << "to try to guess the pb" << std::endl; - delete f; + f->Delete(); continue; } - gdcm::FileHelper *fh = new gdcm::FileHelper(f); + gdcm::FileHelper *fh = gdcm::FileHelper::New(f); fh->SetPrintLevel( level ); fh->Print(); @@ -535,7 +563,7 @@ int main(int argc, char *argv[]) if ( strPatientOrientation != gdcm::GDCM_UNFOUND && strPatientOrientation != "") std::cout << "PatientOrientation (0x0020,0x0020)= [" - << strPatientOrientation << "]" << std::endl; + << strPatientOrientation << "]" << std::endl; std::string strImageOrientationPatient = f->GetEntryString(0x0020,0x0037); @@ -556,32 +584,33 @@ int main(int argc, char *argv[]) // Let's compute 'user friendly' results about 'Orientation' // --------------------------------------------------------- - gdcm::Orientation o; + gdcm::Orientation *o = gdcm::Orientation::New(); + if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND || strImageOrientationRET != gdcm::GDCM_UNFOUND ) { - gdcm::OrientationType orient = o.GetOrientationType( f ); + gdcm::OrientationType orient = o->GetOrientationType( f ); std::cout << "TypeOrientation = " << orient << " (-> " - << o.GetOrientationTypeString(orient) << " )" << std::endl; + << o->GetOrientationTypeString(orient) << " )" << std::endl; } - std::string ori = o.GetOrientation ( f ); + std::string ori = o->GetOrientation ( f ); if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; + o->Delete(); //------------------------------- - if (f->IsReadable()) std::cout <c_str()<<" is Readable"<c_str()<<" is NOT Readable"<Delete(); + fh->Delete(); } std::cout<