X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=84d0960372826ba149c8fd35b3530685475e7182;hb=0ed9f088aad1ff61cf96c1203145c7461f2f70d7;hp=5ce57e0374bea325a4cc18c885ed667d9d27b743;hpb=ea0305c2b6023beec21e73eb1a88a672f8fbd2fd;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 5ce57e03..84d09603 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2006/06/30 09:55:20 $ - Version: $Revision: 1.81 $ + Date: $Date: 2007/09/12 12:36:50 $ + Version: $Revision: 1.85 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,18 +32,18 @@ // TODO : code factorization, for 'single file' an 'whole directory' processing -void ShowLutData(gdcm::File *f); +void ShowLutData(GDCM_NAME_SPACE::File *f); // Nothing is written yet to get LUT Data user friendly // The following is to be moved into a PixelReadConvert method // Let here, waiting for a clever idea on the way to do it. -void ShowLutData(gdcm::File *f) +void ShowLutData(GDCM_NAME_SPACE::File *f) { - gdcm::SeqEntry *modLutSeq = f->GetSeqEntry(0x0028,0x3000); + GDCM_NAME_SPACE::SeqEntry *modLutSeq = f->GetSeqEntry(0x0028,0x3000); if ( modLutSeq !=0 ) { - gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem(); + GDCM_NAME_SPACE::SQItem *sqi= modLutSeq->GetFirstSQItem(); if ( sqi != 0 ) { std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002); @@ -70,7 +70,7 @@ void ShowLutData(gdcm::File *f) std::cout << "Wrong LUT descriptor" << std::endl; } //LUT Data (CTX dependent) - gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); + GDCM_NAME_SPACE::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); if ( b != 0 ) { int BitsAllocated = f->GetBitsAllocated(); @@ -125,11 +125,13 @@ int main(int argc, char *argv[]) " \n PrintFile : \n ", " Display the header of a ACR-NEMA/PAPYRUS/DICOM File ", " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]", - " [forceload=listOfElementsToForceLoad] ", + " [forceload=listOfElementsToForceLoad] [rec] [noex] ", " [4DLoc= ][dict= privateDirectory] ", " [ { [noshadowseq] | [noshadow][noseq] } ] ", " [debug] [warning] ", " level = 0,1,2 : depending on the amount of details user wants to see", + " rec : user wants to parse recursively the directory ", + " noex : user doen't want extra 'user friendly' info ", " 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 ", @@ -143,7 +145,7 @@ int main(int argc, char *argv[]) FINISH_USAGE // Initialize Arguments Manager - gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); + GDCM_NAME_SPACE::ArgMgr *am= new GDCM_NAME_SPACE::ArgMgr(argc, argv); if (argc == 1 || am->ArgMgrDefined("usage") ) { @@ -164,23 +166,26 @@ int main(int argc, char *argv[]) am->ArgMgrUsage(usage); // Display 'usage' delete am; return 1; - } - + } + + bool noex = ( 0 != am->ArgMgrDefined("noex") ); + bool rec = ( 0 != am->ArgMgrDefined("rec") ); + if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); if (am->ArgMgrDefined("warning")) - gdcm::Debug::WarningOn(); + GDCM_NAME_SPACE::Debug::WarningOn(); - int loadMode = gdcm::LD_ALL; + int loadMode = GDCM_NAME_SPACE::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= gdcm::LD_NOSHADOWSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= gdcm::LD_NOSHADOW; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= gdcm::LD_NOSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSEQ; } int level = am->ArgMgrGetInt("level", 1); @@ -228,12 +233,12 @@ int main(int argc, char *argv[]) if (ddict) { - gdcm::Global::GetDicts()->GetDefaultPubDict()->AddDict(dict); + GDCM_NAME_SPACE::Global::GetDicts()->GetDefaultPubDict()->AddDict(dict); } if ( fileName != 0 ) // ====== Deal with a single file ====== { - gdcm::File *f = gdcm::File::New(); + GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New(); f->SetLoadMode(loadMode); f->SetFileName( fileName ); @@ -250,9 +255,9 @@ errno = 0; bool res = f->Load(); - // gdcm::File::IsReadable() is no usable here, because we deal with + // GDCM_NAME_SPACE::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) + // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::DicomDir) if ( !res ) { std::cout << "Cannot process file [" << fileName << "]" << std::endl; @@ -268,7 +273,7 @@ errno = 0; if (nbP == 1) f->SetFourthDimensionLocation(FourthDimLoc[0],FourthDimLoc[1]); - gdcm::FileHelper *fh = gdcm::FileHelper::New(f); + GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f); fh->SetPrintLevel( level ); fh->Print(); @@ -278,7 +283,8 @@ errno = 0; std::cout <GetImageDataSize() << std::endl; std::cout <<" dataSizeRaw " << fh->GetImageDataRawSize() << std::endl; - +if (!noex) +{ int nX,nY,nZ,nT,sPP,planarConfig; std::string pixelType; nX=f->GetXSize(); @@ -333,54 +339,83 @@ errno = 0; std::cout << "Z spacing " << f->GetZSpacing() << std::endl; //------------------------------ - // Lets's get and print some usefull fields about 'Orientation' + + // Let's get and print some usefull fields about 'Orientation' // ------------------------------------------------------------ std::string strPatientPosition = f->GetEntryString(0x0018,0x5100); - if ( strPatientPosition != gdcm::GDCM_UNFOUND + if ( strPatientPosition != GDCM_NAME_SPACE::GDCM_UNFOUND && strPatientPosition != "" ) std::cout << "PatientPosition (0x0010,0x5100)= [" << strPatientPosition << "]" << std::endl; std::string strViewPosition = f->GetEntryString(0x0018,0x5101); - if ( strViewPosition != gdcm::GDCM_UNFOUND + if ( strViewPosition != GDCM_NAME_SPACE::GDCM_UNFOUND && strViewPosition != "" ) - std::cout << "strViewPosition (0x0010,0x5101)= [" + std::cout << "View Position (0x0018,0x5101)= [" << strViewPosition << "]" << std::endl; std::string strPatientOrientation = f->GetEntryString(0x0020,0x0020); - if ( strPatientOrientation != gdcm::GDCM_UNFOUND + if ( strPatientOrientation != GDCM_NAME_SPACE::GDCM_UNFOUND && strPatientOrientation != "") std::cout << "PatientOrientation (0x0020,0x0020)= [" << strPatientOrientation << "]" << std::endl; std::string strImageOrientationPatient = f->GetEntryString(0x0020,0x0037); - if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND + if ( strImageOrientationPatient != GDCM_NAME_SPACE::GDCM_UNFOUND && strImageOrientationPatient != "" ) std::cout << "ImageOrientationPatient (0x0020,0x0037)= [" << strImageOrientationPatient << "]" << std::endl; std::string strImageOrientationRET = f->GetEntryString(0x0020,0x0035); - if ( strImageOrientationRET != gdcm::GDCM_UNFOUND + if ( strImageOrientationRET != GDCM_NAME_SPACE::GDCM_UNFOUND && strImageOrientationRET != "" ) std::cout << "ImageOrientationRET (0x0020,0x0035)= [" << strImageOrientationRET << "]" << std::endl; + std::string strImagePositionPatient = + f->GetEntryString(0x0020,0x0032); + if ( strImagePositionPatient != GDCM_NAME_SPACE::GDCM_UNFOUND + && strImagePositionPatient != "" ) + std::cout << "ImagePositionPatient (0x0020,0x0032)= [" + << strImagePositionPatient << "]" << std::endl; + + std::string strImagePositionPatientRET = + f->GetEntryString(0x0020,0x0030); + if ( strImagePositionPatientRET != GDCM_NAME_SPACE::GDCM_UNFOUND + && strImagePositionPatientRET != "" ) + std::cout << "ImagePositionPatientRET (0x0020,0x0030)= [" + << strImagePositionPatientRET << "]" << std::endl; + + float iop[6]; + /*bool riop = */f->GetImageOrientationPatient(iop); + float ipp[3]; + /*bool ripp = */f->GetImagePositionPatient(ipp); + + std::cout << "Image Position (0x0020,0x0032|0x0030) : " + << ipp[0] << " , " << ipp[1] << " , "<< ipp[2] + << std::endl; + std::cout << "Image Orientation (0x0020,0x0037|0x0035) : " + << iop[0] << " , " << iop[1] << " , "<< iop[2] << " , " + << iop[3] << " , " << iop[4] << " , "<< iop[5] + << std::endl; + + // Let's compute 'user friendly' results about 'Orientation' // --------------------------------------------------------- - gdcm::Orientation *o = gdcm::Orientation::New(); + GDCM_NAME_SPACE::Orientation *o = GDCM_NAME_SPACE::Orientation::New(); - if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND || - strImageOrientationRET != gdcm::GDCM_UNFOUND ) + if ( strImageOrientationPatient != GDCM_NAME_SPACE::GDCM_UNFOUND || + strImageOrientationRET != GDCM_NAME_SPACE::GDCM_UNFOUND ) { - gdcm::OrientationType orient = o->GetOrientationType( f ); + GDCM_NAME_SPACE::OrientationType orient = o->GetOrientationType( f ); std::cout << "TypeOrientation = " << orient << " (-> " << o->GetOrientationTypeString(orient) << " )" << std::endl; @@ -389,8 +424,8 @@ errno = 0; std::string ori = o->GetOrientation ( f ); if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; - - o->Delete(); + o->Delete(); +} //------------------------------ @@ -405,10 +440,10 @@ errno = 0; // Nothing is written yet to get LUT Data user friendly // The following is to be moved into a PixelRedaConvert method - gdcm::SeqEntry *modLutSeq = f->GetSeqEntry(0x0028,0x3000); + GDCM_NAME_SPACE::SeqEntry *modLutSeq = f->GetSeqEntry(0x0028,0x3000); if ( modLutSeq !=0 ) { - gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem(); + GDCM_NAME_SPACE::SQItem *sqi= modLutSeq->GetFirstSQItem(); if ( !sqi ) { std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002); @@ -424,7 +459,7 @@ errno = 0; { std::cout << "Wrong LUT descriptor" << std::endl; } - gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); + GDCM_NAME_SPACE::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); if ( b != 0 ) { if ( b->GetLength() != 0 ) @@ -467,7 +502,7 @@ errno = 0; ShowLutData(f); } - // Parsability of the gdcm::Document already checked, after Load() ! + // Parsability of the GDCM_NAME_SPACE::Document already checked, after Load() ! if ( f->IsReadable() ) { @@ -496,18 +531,19 @@ errno = 0; else // ====== Deal with a Directory ====== { std::cout << "dirName [" << dirName << "]" << std::endl; - gdcm::DirList dirList(dirName,1); // gets recursively the file list - gdcm::DirListType fileList = dirList.GetFilenames(); - gdcm::File *f; + + GDCM_NAME_SPACE::DirList dirList(dirName,rec); // gets recursively (or not) the file list + GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames(); + GDCM_NAME_SPACE::File *f; bool res; - for( gdcm::DirListType::iterator it = fileList.begin(); + for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { std::cout << std::endl<<" Start processing :[" << it->c_str() << "]" << std::endl; - f = gdcm::File::New(); + f = GDCM_NAME_SPACE::File::New(); f->SetLoadMode(loadMode); f->SetFileName( it->c_str() ); @@ -535,46 +571,47 @@ errno = 0; continue; } - gdcm::FileHelper *fh = gdcm::FileHelper::New(f); + GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f); fh->SetPrintLevel( level ); fh->Print(); //------------------------------ - +if (!noex) +{ // Lets's get and print some usefull fields about 'Orientation' // ------------------------------------------------------------ std::string strPatientPosition = f->GetEntryString(0x0018,0x5100); - if ( strPatientPosition != gdcm::GDCM_UNFOUND + if ( strPatientPosition != GDCM_NAME_SPACE::GDCM_UNFOUND && strPatientPosition != "" ) std::cout << "PatientPosition (0x0010,0x5100)= [" << strPatientPosition << "]" << std::endl; std::string strViewPosition = f->GetEntryString(0x0018,0x5101); - if ( strViewPosition != gdcm::GDCM_UNFOUND + if ( strViewPosition != GDCM_NAME_SPACE::GDCM_UNFOUND && strViewPosition != "" ) std::cout << "strViewPosition (0x0010,0x5101)= [" << strViewPosition << "]" << std::endl; std::string strPatientOrientation = f->GetEntryString(0x0020,0x0020); - if ( strPatientOrientation != gdcm::GDCM_UNFOUND + if ( strPatientOrientation != GDCM_NAME_SPACE::GDCM_UNFOUND && strPatientOrientation != "") std::cout << "PatientOrientation (0x0020,0x0020)= [" << strPatientOrientation << "]" << std::endl; std::string strImageOrientationPatient = f->GetEntryString(0x0020,0x0037); - if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND + if ( strImageOrientationPatient != GDCM_NAME_SPACE::GDCM_UNFOUND && strImageOrientationPatient != "" ) std::cout << "ImageOrientationPatient (0x0020,0x0037)= [" << strImageOrientationPatient << "]" << std::endl; std::string strImageOrientationRET = f->GetEntryString(0x0020,0x0035); - if ( strImageOrientationRET != gdcm::GDCM_UNFOUND + if ( strImageOrientationRET != GDCM_NAME_SPACE::GDCM_UNFOUND && strImageOrientationRET != "" ) { std::cout << "ImageOrientationRET (0x0020,0x0035)= [" @@ -584,14 +621,14 @@ errno = 0; // Let's compute 'user friendly' results about 'Orientation' // --------------------------------------------------------- - gdcm::Orientation *o = gdcm::Orientation::New(); + GDCM_NAME_SPACE::Orientation *o = GDCM_NAME_SPACE::Orientation::New(); - if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND || - strImageOrientationRET != gdcm::GDCM_UNFOUND ) + if ( strImageOrientationPatient != GDCM_NAME_SPACE::GDCM_UNFOUND || + strImageOrientationRET != GDCM_NAME_SPACE::GDCM_UNFOUND ) { - gdcm::OrientationType orient = o->GetOrientationType( f ); + GDCM_NAME_SPACE::OrientationType orient = o->GetOrientationType( f ); std::cout << "TypeOrientation = " << orient << " (-> " << o->GetOrientationTypeString(orient) << " )" << std::endl; @@ -601,7 +638,7 @@ errno = 0; if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; o->Delete(); - +} //------------------------------- if (f->IsReadable())