Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2005/11/07 10:38:56 $
- Version: $Revision: 1.70 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.84 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// 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);
if ( /*lutDescriptor == GDCM_UNFOUND*/ 0 )
{
- //gdcmWarningMacro( "LUT Descriptor is missing" );
std::cout << "LUT Descriptor is missing" << std::endl;
return;
}
<< 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);
+ GDCM_NAME_SPACE::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006);
if ( b != 0 )
{
int BitsAllocated = f->GetBitsAllocated();
" 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 ",
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") )
{
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) )
}
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;
+ if ( am->ArgMgrDefined("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);
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 */
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::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 = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode(loadMode);
f->SetFileName( fileName );
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_NAME_SPACE::File::IsReadable() is no usable here, because we deal with
+ // any kind of gdcm-Parsable *document*
+ // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::DicomDir)
if ( !res )
{
std::cout << "Cannot process file [" << fileName << "]" << std::endl;
f->Delete();
return 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();
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();
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;
-
+ 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'
+
+ // 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_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;
+ << 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();
//------------------------------
// 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);
&length, &deb, &nbits );
if ( nbRead != 3 )
{
- //gdcmWarningMacro( "Wrong LUT descriptor" );
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 )
ShowLutData(f);
}
- //if( !f->gdcm::Document::IsReadable())
- // Try downcast to please MSVC
- if ( !((gdcm::Document *)f)->IsReadable() )
- {
- std::cout <<std::endl<<fileName<<" is NOT 'gdcm parsable'"<<std::endl;
- }
-
+ // Parsability of the GDCM_NAME_SPACE::Document already checked, after Load() !
+
if ( f->IsReadable() )
{
std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
std::cout<<std::flush;
f->Delete();
- delete fh;
+ fh->Delete();
}
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,1); // gets recursively 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() );
continue;
}
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
fh->SetPrintLevel( level );
fh->Print();
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;
+ << 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)= ["
// Let's compute 'user friendly' results about 'Orientation'
// ---------------------------------------------------------
- gdcm::Orientation o;
+ 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;
+ << 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 <<std::endl<<it->c_str()<<" is Readable"<<std::endl;