Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2005/10/20 08:53:21 $
- Version: $Revision: 1.65 $
+ Date: $Date: 2006/01/26 15:52:43 $
+ Version: $Revision: 1.79 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmOrientation.h"
#include <iostream>
-// TODO : code factorization, for 'sigle file' an 'whole directory' processing
+// TODO : code factorization, for 'single file' an 'whole directory' processing
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;
}
<< 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);
" 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 ",
" 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;
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 = new gdcm::File();
+ 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;
<< 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();
pixelType = f->GetPixelType();
sPP = f->GetSamplesPerPixel();
- planarConfig = f->GetPlanarConfiguration();
-
std::cout << " pixelType= [" << pixelType
<< "] SamplesPerPixel= [" << sPP
- << "] PlanarConfiguration= [" << planarConfig
- << "] "<< std::endl
- << " PhotometricInterpretation= ["
- << f->GetEntryString(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();
std::cout << "Transfer Syntax not loaded. " << std::endl
<< "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
<< std::endl;
+ f->Delete();
return 0;
}
// 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();
//------------------------------
gdcm::SQItem *sqi= modLutSeq->GetFirstSQItem();
if ( !sqi )
{
- std::string lutDescriptor = sqi->GetEntryString(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)
&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;
- delete f;
- delete fh;
+ f->Delete();
+ fh->Delete();
}
else // ====== Deal with a Directory ======
{
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() );
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();
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;
else
std::cout <<std::endl<<it->c_str()<<" is NOT Readable"<<std::endl;
std::cout << "\n\n" << std::endl;
- delete f;
- delete fh;
+ f->Delete();
+ fh->Delete();
}
std::cout<<std::flush;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff