X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=8e42f004dfa91d426524ca02ee106f65ef54e751;hb=7fba5f430c8147f53cfdf667981fc9f380cf64ba;hp=3cdfabf980e219a288df5859d7c582649dd4c9a6;hpb=e611cee575591400c561d6d95c240b3d196a2dd5;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 3cdfabf9..8e42f004 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/09/30 17:42:17 $ - Version: $Revision: 1.60 $ + Date: $Date: 2005/11/28 11:54:45 $ + Version: $Revision: 1.75 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,7 +19,7 @@ #include "gdcmDocument.h" #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" -#include "gdcmBinEntry.h" +#include "gdcmDataEntry.h" #include "gdcmFileHelper.h" #include "gdcmDebug.h" @@ -30,94 +30,93 @@ #include "gdcmOrientation.h" #include +// TODO : code factorization, for 'single file' an 'whole directory' processing void ShowLutData(gdcm::File *f); -void ShowLutData(gdcm::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. - - gdcm::SeqEntry *modLutSeq = f->GetSeqEntry(0x0028,0x3000); - if ( modLutSeq !=0 ) + +void ShowLutData(gdcm::File *f) +{ + gdcm::SeqEntry *modLutSeq = f->GetSeqEntry(0x0028,0x3000); + if ( modLutSeq !=0 ) + { + gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem(); + if ( sqi != 0 ) { - gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem(); - if ( sqi != 0 ) + std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002); + if ( /*lutDescriptor == GDCM_UNFOUND*/ 0 ) { - std::string lutDescriptor = sqi->GetEntryValue(0x0028,0x3002); - if ( /*lutDescriptor == GDCM_UNFOUND*/ 0 ) - { - //gdcmWarningMacro( "LUT Descriptor is missing" ); - std::cout << "LUT Descriptor is missing" << std::endl; - return; - } - 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) - - nbRead = sscanf( lutDescriptor.c_str(), - "%d\\%d\\%d", - &length, &deb, &nbits ); - std::cout << "length " << length - << " deb " << deb - << " nbits " << nbits - << std::endl; - if ( nbRead != 3 ) - { - //gdcmWarningMacro( "Wrong LUT descriptor" ); - std::cout << "Wrong LUT descriptor" << std::endl; - } - //LUT Data (CTX dependent) - gdcm::BinEntry *b = sqi->GetBinEntry(0x0028,0x3006); - if ( b != 0 ) + std::cout << "LUT Descriptor is missing" << std::endl; + return; + } + 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) + + nbRead = sscanf( lutDescriptor.c_str(), + "%d\\%d\\%d", + &length, &deb, &nbits ); + std::cout << "length " << length + << " deb " << deb + << " nbits " << nbits + << std::endl; + if ( nbRead != 3 ) + { + std::cout << "Wrong LUT descriptor" << std::endl; + } + //LUT Data (CTX dependent) + gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); + if ( b != 0 ) + { + int BitsAllocated = f->GetBitsAllocated(); + if ( BitsAllocated <= 8 ) { - int BitsAllocated = f->GetBitsAllocated(); - if ( BitsAllocated <= 8 ) - { - int mult; - if ( ( nbits == 16 ) && ( BitsAllocated == 8 ) ) - { - // when LUT item size is different than pixel size - mult = 2; // high byte must be = low byte - } - else - { - // See PS 3.3-2003 C.11.1.1.2 p 619 - mult = 1; - } - uint8_t *lut = b->GetBinArea(); - for( int i=0; i < length; ++i ) - { - std::cout << i+deb << " : \t" - << (int) (lut[i*mult + 1]) << std::endl; - } + int mult; + if ( ( nbits == 16 ) && ( BitsAllocated == 8 ) ) + { + // when LUT item size is different than pixel size + mult = 2; // high byte must be = low byte } else { - uint16_t *lut = (uint16_t *)(b->GetBinArea()); - for( int i=0; i < length; ++i ) - { - std::cout << i+deb << " : \t" - << (int) (((uint16_t *)lut)[i]) - << std::endl; - } + // See PS 3.3-2003 C.11.1.1.2 p 619 + mult = 1; } - } + uint8_t *lut = b->GetBinArea(); + for( int i=0; i < length; ++i ) + { + std::cout << i+deb << " : \t" + << (int) (lut[i*mult + 1]) << std::endl; + } + } else - std::cout << "No LUT Data BinEntry (0x0028,0x3006) found?!? " - << std::endl; - } + { + uint16_t *lut = (uint16_t *)(b->GetBinArea()); + for( int i=0; i < length; ++i ) + { + std::cout << i+deb << " : \t" + << (int) (((uint16_t *)lut)[i]) + << std::endl; + } + } + } else - std::cout << "No First SQ Item within (0x0028,0x3000) ?!? " - << std::endl; + std::cout << "No LUT Data DataEntry (0x0028,0x3006) found?!? " + << std::endl; } else - std::cout << "No LUT Data SeqEntry (0x0028,0x3000) found " - << std::endl; + std::cout << "No First SQ Item within (0x0028,0x3000) ?!? " + << std::endl; } + else + std::cout << "No LUT Data SeqEntry (0x0028,0x3000) found " + << std::endl; +} int main(int argc, char *argv[]) { @@ -128,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 ", @@ -137,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 @@ -147,27 +148,29 @@ int main(int argc, char *argv[]) { am->ArgMgrUsage(usage); // Display 'usage' delete am; - return 0; + return 1; } char *fileName = am->ArgMgrGetString("filein",(char *)0); char *dirName = am->ArgMgrGetString("dirin",(char *)0); - if ( (fileName == 0 && dirName == 0) - || + if ( (fileName == 0 && dirName == 0) || (fileName != 0 && dirName != 0) ) { - std::cout <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; @@ -200,28 +203,13 @@ int main(int argc, char *argv[]) { am->ArgMgrUsage(usage); delete am; - return 0; + return 1; } delete am; // we don't need Argument Manager any longer // ----------- End Arguments Manager --------- - std::string tabOrientation[13] = { - "Not Applicable", - "Axial", - "Coronal", - "Sagital", - "Heart Axial", - "Heart Coronal", - "Heart Sagital", - "Axial invert", - "Coronal invert", - "Sagital invert", - "Heart Axial invert", - "Heart Coronal invert", - "Heart Sagital invert" - }; if (ddict) { @@ -230,11 +218,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 ); @@ -243,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; @@ -254,11 +247,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(); @@ -279,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->GetEntryValue(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(); @@ -295,50 +292,61 @@ int main(int argc, char *argv[]) << " LUT = " << (f->HasLUT() ? "TRUE" : "FALSE") << std::endl; - if ( f->GetEntryValue(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) - { - std::cout << "Transfer Syntax not loaded. " << std::endl - << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" - << std::endl; - return 0; - } + if ( f->GetDataEntry(0x0002,0x0010) ) + if ( f->GetDataEntry(0x0002,0x0010)->IsNotLoaded() ) + { + std::cout << "Transfer Syntax not loaded. " << std::endl + << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" + << std::endl; + f->Delete(); + return 0; + } std::string transferSyntaxName = f->GetTransferSyntaxName(); 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); + f->GetEntryString(0x0018,0x5100); if ( strPatientPosition != gdcm::GDCM_UNFOUND && strPatientPosition != "" ) std::cout << "PatientPosition (0x0010,0x5100)= [" << strPatientPosition << "]" << std::endl; + std::string strViewPosition = + f->GetEntryString(0x0018,0x5101); + if ( strViewPosition != gdcm::GDCM_UNFOUND + && strViewPosition != "" ) + std::cout << "strViewPosition (0x0010,0x5101)= [" + << strViewPosition << "]" << std::endl; + std::string strPatientOrientation = - f->GetEntryValue(0x0020,0x0020); + f->GetEntryString(0x0020,0x0020); if ( strPatientOrientation != gdcm::GDCM_UNFOUND && strPatientOrientation != "") std::cout << "PatientOrientation (0x0020,0x0020)= [" << strPatientOrientation << "]" << std::endl; std::string strImageOrientationPatient = - f->GetEntryValue(0x0020,0x0037); + f->GetEntryString(0x0020,0x0037); if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND && strImageOrientationPatient != "" ) std::cout << "ImageOrientationPatient (0x0020,0x0037)= [" << strImageOrientationPatient << "]" << std::endl; std::string strImageOrientationRET = - f->GetEntryValue(0x0020,0x0035); + f->GetEntryString(0x0020,0x0035); if ( strImageOrientationRET != gdcm::GDCM_UNFOUND && strImageOrientationRET != "" ) std::cout << "ImageOrientationRET (0x0020,0x0035)= [" @@ -347,24 +355,24 @@ 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 ) { - double orient = o.TypeOrientation( f ); - int k = (int)orient; - if (k < 0) - k = -k + 6; + gdcm::OrientationType orient = o->GetOrientationType( f ); std::cout << "TypeOrientation = " << orient << " (-> " - << tabOrientation[k] << " )" << 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(); +//------------------------------ // Display the LUT as an int array (for debugging purpose) @@ -384,7 +392,7 @@ int main(int argc, char *argv[]) gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem(); if ( !sqi ) { - std::string lutDescriptor = sqi->GetEntryValue(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) @@ -395,10 +403,9 @@ int main(int argc, char *argv[]) &length, &deb, &nbits ); if ( nbRead != 3 ) { - //gdcmWarningMacro( "Wrong LUT descriptor" ); std::cout << "Wrong LUT descriptor" << std::endl; } - gdcm::BinEntry *b = sqi->GetBinEntry(0x0028,0x3006); + gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); if ( b != 0 ) { if ( b->GetLength() != 0 ) @@ -441,15 +448,12 @@ 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()) + // Parsability of the gdcm::Document already checked, after Load() ! + + if ( f->IsReadable() ) + { std::cout <GetSeqEntry(0x0041,0x1010) ) { std::cout <Delete(); + fh->Delete(); } else // ====== Deal with a Directory ====== { @@ -478,13 +481,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() ); @@ -508,35 +512,89 @@ 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(); - gdcm::Orientation o; - std::string ori = o.GetOrientation ( f ); - if (ori != gdcm::GDCM_UNFOUND ) - std::cout << "- Orientation [" << ori << "]" << std::endl; - - double d = o.TypeOrientation( f ); - int k = (int)d; - if (k < 0) - k = -k + 6; - - std::cout << "TypeOrientation = " << d << " (-> " - << tabOrientation[k] << std::endl; + +//------------------------------ + + // Lets's get and print some usefull fields about 'Orientation' + // ------------------------------------------------------------ + + std::string strPatientPosition = + f->GetEntryString(0x0018,0x5100); + if ( strPatientPosition != gdcm::GDCM_UNFOUND + && strPatientPosition != "" ) + std::cout << "PatientPosition (0x0010,0x5100)= [" + << strPatientPosition << "]" << std::endl; + + std::string strViewPosition = + f->GetEntryString(0x0018,0x5101); + if ( strViewPosition != gdcm::GDCM_UNFOUND + && strViewPosition != "" ) + std::cout << "strViewPosition (0x0010,0x5101)= [" + << strViewPosition << "]" << std::endl; + + std::string strPatientOrientation = + f->GetEntryString(0x0020,0x0020); + if ( strPatientOrientation != gdcm::GDCM_UNFOUND + && strPatientOrientation != "") + std::cout << "PatientOrientation (0x0020,0x0020)= [" + << strPatientOrientation << "]" << std::endl; + + std::string strImageOrientationPatient = + f->GetEntryString(0x0020,0x0037); + if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND + && strImageOrientationPatient != "" ) + std::cout << "ImageOrientationPatient (0x0020,0x0037)= [" + << strImageOrientationPatient << "]" << std::endl; + + std::string strImageOrientationRET = + f->GetEntryString(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 = gdcm::Orientation::New(); + + + 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; + + o->gdcm::Orientation::Delete(); + +//------------------------------- if (f->IsReadable()) std::cout <c_str()<<" is Readable"<c_str()<<" is NOT Readable"<Delete(); + fh->Delete(); } std::cout<