X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=a8c61272cae5bfee80e249794a850508cd0749a0;hb=48f7ce7aa61778477992107caf15e8960359e66b;hp=d2291f7aa1269f1d6491d01b34103d933cad21d8;hpb=6b51b22366f878e1050c75a6ebb755bd2ff365c7;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index d2291f7a..a8c61272 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/25 14:52:27 $ - Version: $Revision: 1.66 $ + Date: $Date: 2006/01/26 15:52:43 $ + Version: $Revision: 1.79 $ 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); @@ -129,7 +127,8 @@ int main(int argc, char *argv[]) " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]", " [forceload=listOfElementsToForceLoad] ", " [dict= privateDirectory] ", - " [ { [noshadowseq] | [noshadow][noseq] } ] [debug] ", + " [ { [noshadowseq] | [noshadow][noseq] } ] ", + " [debug] [warning] ", " level = 0,1,2 : depending on the amount of details user wants to see", " listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)", " of Elements to load whatever their length ", @@ -138,6 +137,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 +151,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 +167,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; @@ -188,11 +191,11 @@ int main(int argc, char *argv[]) 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,10 +218,6 @@ 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 = gdcm::File::New(); f->SetLoadMode(loadMode); f->SetFileName( fileName ); @@ -228,8 +227,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; @@ -264,14 +272,18 @@ int main(int argc, char *argv[]) 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(); @@ -343,22 +355,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(); //------------------------------ @@ -390,7 +403,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); @@ -436,13 +448,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(); - delete fh; + fh->Delete(); } else // ====== Deal with a Directory ====== { @@ -537,7 +544,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); @@ -558,24 +565,25 @@ 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"<