X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=2064640f10f4b4d6af75d68d432c2a966664767c;hb=544e9b239eea5ec46a1e637a58e9cbe86afdc08a;hp=71a2ea9c86da0f17b72d5836b491e21ffd2a0b25;hpb=b499c7295859d9f7d25e19162b581ba67917dc69;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 71a2ea9c..2064640f 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/11/15 10:40:45 $ - Version: $Revision: 1.71 $ + Date: $Date: 2006/03/29 16:15:01 $ + Version: $Revision: 1.80 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -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); @@ -128,10 +126,11 @@ 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] ", + " [4DLoc= ][dict= privateDirectory] ", " [ { [noshadowseq] | [noshadow][noseq] } ] ", " [debug] [warning] ", " level = 0,1,2 : depending on the amount of details user wants to see", + " 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 ", " privateDirectory : source file full path name of Shadow Group elems ", @@ -153,8 +152,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) ) @@ -178,7 +177,7 @@ int main(int argc, char *argv[]) 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; @@ -189,15 +188,29 @@ int main(int argc, char *argv[]) int forceLoadNb; uint16_t *elemsToForceLoad = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb); + + int nbP; + uint16_t *FourthDimLoc; + if ( am->ArgMgrDefined("4DLoc") ) + { + FourthDimLoc = am->ArgMgrGetXInt16Enum("4DLoc", &nbP); + + if (nbP != 1) + { + std::cout << "4DLoc must have 2 and only 2 components!" << std::endl; + delete am; + return 1; + } + } 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 */ @@ -229,6 +242,12 @@ 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 @@ -246,6 +265,8 @@ int main(int argc, char *argv[]) f->Delete(); return 0; } + if (nbP == 1) + f->SetFourthDimensionLocation(FourthDimLoc[0],FourthDimLoc[1]); gdcm::FileHelper *fh = gdcm::FileHelper::New(f); fh->SetPrintLevel( level ); @@ -258,12 +279,14 @@ int main(int argc, char *argv[]) std::cout <<" dataSize " << fh->GetImageDataSize() << std::endl; std::cout <<" dataSizeRaw " << fh->GetImageDataRawSize() << std::endl; - int nX,nY,nZ,sPP,planarConfig; + int nX,nY,nZ,nT,sPP,planarConfig; std::string pixelType; nX=f->GetXSize(); nY=f->GetYSize(); nZ=f->GetZSize(); - std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ + nT=f->GetTSize(); + std::cout << " DIMX=" << nX << " DIMY=" << nY + << " DIMZ=" << nZ << " DIMT=" << nT << std::endl; pixelType = f->GetPixelType(); @@ -351,22 +374,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(); //------------------------------ @@ -398,7 +422,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); @@ -468,7 +491,7 @@ int main(int argc, char *argv[]) std::cout<Delete(); - delete fh; + fh->Delete(); } else // ====== Deal with a Directory ====== { @@ -540,7 +563,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); @@ -561,24 +584,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"<