X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=3cd654f92d9b87e9a559a6f5ea57fd2c0fb105a8;hb=20233e0e4bc268a63105f697c663feedecbe99f7;hp=6a01b9041faab88f618a916b8b98e268ae82d95e;hpb=4cf608c37695b2385eebeb1426ca8cc87f1c8108;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 6a01b904..3cd654f9 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: 2005/11/18 11:45:34 $ + Version: $Revision: 1.72 $ 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); @@ -129,7 +129,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 +139,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 @@ -167,7 +169,10 @@ 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; @@ -215,11 +220,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 ); @@ -230,6 +231,9 @@ int main(int argc, char *argv[]) } 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 +243,11 @@ 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; } - gdcm::FileHelper *fh = new gdcm::FileHelper(f); + gdcm::FileHelper *fh = gdcm::FileHelper::New(f); fh->SetPrintLevel( level ); fh->Print(); @@ -264,14 +268,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(); @@ -286,6 +294,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 +351,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->gdcm::Orientation::Delete(); //------------------------------ @@ -378,7 +388,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) @@ -435,13 +445,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; } else // ====== Deal with a Directory ====== @@ -473,13 +478,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 +509,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(); @@ -556,32 +562,34 @@ 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->gdcm::Orientation::Delete(); //------------------------------- - if (f->IsReadable()) std::cout <c_str()<<" is Readable"<c_str()<<" is NOT Readable"<Delete(); + fh->Delete(); } std::cout<