Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2005/10/27 09:07:45 $
- Version: $Revision: 1.68 $
+ 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
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);
" 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] ",
+ " [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 ",
" 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
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();
-
+
+ if (am->ArgMgrDefined("warning"))
+ gdcm::Debug::WarningOn();
+
int loadMode = gdcm::LD_ALL;
if ( am->ArgMgrDefined("noshadowseq") )
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;
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 ( 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();
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::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;
f->Delete();
return 0;
}
+ if (nbP == 1)
+ f->SetFourthDimensionLocation(FourthDimLoc[0],FourthDimLoc[1]);
gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
fh->SetPrintLevel( level );
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();
sPP = f->GetSamplesPerPixel();
- if (sPP == 3)
- planarConfig = f->GetPlanarConfiguration();
-
std::cout << " pixelType= [" << pixelType
<< "] SamplesPerPixel= [" << sPP
<< "] ";
+
if (sPP == 3)
+ {
+ planarConfig = f->GetPlanarConfiguration();
std::cout << " PlanarConfiguration= [" << planarConfig
<< "] "<< std::endl;
-
+ }
std::cout << " PhotometricInterpretation= ["
<< f->GetEntryString(0x0028,0x0004)
<< "] "<< std::endl;
// 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();
//------------------------------
&length, &deb, &nbits );
if ( nbRead != 3 )
{
- //gdcmWarningMacro( "Wrong LUT descriptor" );
std::cout << "Wrong LUT descriptor" << std::endl;
}
gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006);
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::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 ======
{
if ( strPatientOrientation != gdcm::GDCM_UNFOUND
&& strPatientOrientation != "")
std::cout << "PatientOrientation (0x0020,0x0020)= ["
- << strPatientOrientation << "]" << std::endl;
+ << strPatientOrientation << "]" << std::endl;
std::string strImageOrientationPatient =
f->GetEntryString(0x0020,0x0037);
// 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 <<std::endl<<it->c_str()<<" is Readable"<<std::endl;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff