X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=f1868e72b3c550ae0e176673b980a1abd263f5d9;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=4310831a6d90de76c4f8fa5a598fa17109f30771;hpb=f3cc252fad08c3e8dbc395f2ca7cabf47bf95302;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 4310831a..f1868e72 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/08/30 15:13:05 $ - Version: $Revision: 1.50 $ + Date: $Date: 2005/10/01 19:39:14 $ + Version: $Revision: 1.61 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,9 +24,10 @@ #include "gdcmFileHelper.h" #include "gdcmDebug.h" #include "gdcmDirList.h" - +#include "gdcmGlobal.h" +#include "gdcmDictSet.h" #include "gdcmArgMgr.h" - +#include "gdcmOrientation.h" #include @@ -126,15 +127,17 @@ 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] ", " level = 0,1,2 : depending on the amount of details user wants to see", - " listOfElementsToForceLOad : group-elem,g2-e2,... (in hexa, no space)", + " listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)", " of Elements to load whatever their length ", - " noshadowseq: user doesn't want to load Private Sequences ", - " 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' ", - " showlut :user wants to display the Palette Color (as an int array)", + " privateDirectory : source file full path name of Shadow Group elems ", + " noshadowseq: user doesn't want to load Private Sequences ", + " 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' ", + " showlut :user wants to display the Palette Color (as an int array) ", FINISH_USAGE // Initialize Arguments Manager @@ -176,14 +179,22 @@ int main(int argc, char *argv[]) loadMode |= gdcm::LD_NOSEQ; } - int level = am->ArgMgrGetInt("level", 2); + int level = am->ArgMgrGetInt("level", 1); int forceLoadNb; uint16_t *elemsToForceLoad - = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb); + = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb); bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") ); + bool ddict = am->ArgMgrDefined("dict") ? true : false; + char *dict = 0; + + if (ddict) + { + dict = am->ArgMgrGetString("dict",(char *)0); + } + /* if unused Param we give up */ if ( am->ArgMgrPrintUnusedLabels() ) { @@ -196,6 +207,12 @@ int main(int argc, char *argv[]) // ----------- End Arguments Manager --------- + + if (ddict) + { + gdcm::Global::GetDicts()->GetDefaultPubDict()->AddDict(dict); + } + if ( fileName != 0 ) // ====== Deal with a single file ====== { // gdcm::File::IsReadable() is no usable here, because we deal with @@ -213,7 +230,6 @@ int main(int argc, char *argv[]) } bool res = f->Load(); - if ( !res ) { std::cout << "Cannot process file [" << fileName << "]" << std::endl; @@ -243,7 +259,8 @@ int main(int argc, char *argv[]) nX=f->GetXSize(); nY=f->GetYSize(); nZ=f->GetZSize(); - std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ << std::endl; + std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ + << std::endl; pixelType = f->GetPixelType(); sPP = f->GetSamplesPerPixel(); @@ -275,12 +292,63 @@ int main(int argc, char *argv[]) std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl; std::cout << " SwapCode= " << f->GetSwapCode() << std::endl; - + std::cout << " ------" << std::endl; //std::cout << "\n\n" << std::endl; //std::cout << "X spacing " << f->GetXSpacing() << std::endl; //std::cout << "Y spacing " << f->GetYSpacing() << std::endl; //std::cout << "Z spacing " << f->GetZSpacing() << std::endl; + // Lets's get and print some usefull fields about 'Orientation' + // ------------------------------------------------------------ + + std::string strPatientPosition = + f->GetEntryValue(0x0018,0x5100); + if ( strPatientPosition != gdcm::GDCM_UNFOUND + && strPatientPosition != "" ) + std::cout << "PatientPosition (0x0010,0x5100)= [" + << strPatientPosition << "]" << std::endl; + + std::string strPatientOrientation = + f->GetEntryValue(0x0020,0x0020); + if ( strPatientOrientation != gdcm::GDCM_UNFOUND + && strPatientOrientation != "") + std::cout << "PatientOrientation (0x0020,0x0020)= [" + << strPatientOrientation << "]" << std::endl; + + std::string strImageOrientationPatient = + f->GetEntryValue(0x0020,0x0037); + if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND + && strImageOrientationPatient != "" ) + std::cout << "ImageOrientationPatient (0x0020,0x0037)= [" + << strImageOrientationPatient << "]" << std::endl; + + std::string strImageOrientationRET = + f->GetEntryValue(0x0020,0x0035); + if ( strImageOrientationRET != gdcm::GDCM_UNFOUND + && strImageOrientationRET != "" ) + std::cout << "ImageOrientationRET (0x0020,0x0035)= [" + << strImageOrientationRET << "]" << std::endl; + + // Let's compute 'user friendly' results about 'Orientation' + // --------------------------------------------------------- + + gdcm::Orientation o; + + if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND || + strImageOrientationRET != gdcm::GDCM_UNFOUND ) + { + + gdcm::OrientationType orient = o.GetOrientationType( f ); + + std::cout << "TypeOrientation = " << orient << " (-> " + << o.GetOrientationTypeString(orient) << " )" << std::endl; + } + + std::string ori = o.GetOrientation ( f ); + if (ori != "\\" ) + std::cout << "Orientation [" << ori << "]" << std::endl; + + // Display the LUT as an int array (for debugging purpose) if ( f->HasLUT() && showlut ) { @@ -302,7 +370,7 @@ int main(int argc, char *argv[]) int length; // LUT length in Bytes int deb; // Subscript of the first Lut Value int nbits; // Lut item size (in Bits) - int nbRead; // nb of items in LUT descriptor (must be = 3) + int nbRead; // nb of items in LUT descriptor (must be = 3) nbRead = sscanf( lutDescriptor.c_str(), "%d\\%d\\%d", @@ -354,11 +422,32 @@ int main(int argc, char *argv[]) std::cout << "Try LUT Data "<< std::endl; ShowLutData(f); } + + //if( !f->gdcm::Document::IsReadable()) + // Try downcast to please MSVC + if ( !((gdcm::Document *)f)->IsReadable() ) + { + std::cout <IsReadable()) std::cout <GetSeqEntry(0x0041,0x1010) ) + { + std::cout <GetSeqEntry(0x0004,0x1220) ) + { + std::cout <c_str() << "]" + << std::endl; f = new gdcm::File(); f->SetLoadMode(loadMode); f->SetFileName( it->c_str() ); for (int ri=0; riAddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], (uint32_t)elemsToForceLoad[2*ri+1]); } @@ -395,8 +487,9 @@ int main(int argc, char *argv[]) << std::endl; std::cout << "or it's not a Dicom File, or its 'header' is bugged" << std::endl; - std::cout << "use 'PrintFile filein=... debug' to try to guess the pb" - << std::endl; + std::cout << "use 'PrintFile filein=... debug' " + << "to try to guess the pb" + << std::endl; delete f; continue; } @@ -405,7 +498,16 @@ int main(int argc, char *argv[]) fh->SetPrintLevel( level ); fh->Print(); + gdcm::Orientation o; + std::string ori = o.GetOrientation ( f ); + if (ori != gdcm::GDCM_UNFOUND ) + std::cout << "- Orientation [" << ori << "]" << std::endl; + gdcm::OrientationType d = o.GetOrientationType( f ); + + std::cout << "TypeOrientation = " << d << " (-> " + << o.GetOrientationTypeString(d) << std::endl; + if (f->IsReadable()) std::cout <c_str()<<" is Readable"<