Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2005/10/20 08:53:21 $
- Version: $Revision: 1.65 $
+ Date: $Date: 2005/10/27 09:07:45 $
+ Version: $Revision: 1.68 $
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);
// 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 );
<< 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();
+ if (sPP == 3)
+ planarConfig = f->GetPlanarConfiguration();
std::cout << " pixelType= [" << pixelType
<< "] SamplesPerPixel= [" << sPP
- << "] PlanarConfiguration= [" << planarConfig
- << "] "<< std::endl
- << " PhotometricInterpretation= ["
- << f->GetEntryString(0x0028,0x0004)
+ << "] ";
+ if (sPP == 3)
+ 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;
}
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)
}
std::cout<<std::flush;
- delete f;
+ f->Delete();
delete fh;
}
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();
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;
}