OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)
MARK_AS_ADVANCED(GDCM_DEBUG)
+# --------------------------------------------------------------------------
+SET (GDCM_NAME_SPACE gdcm CACHE STRING "name space")
+
# --------------------------------------------------------------------------
# Install directories
STRING(TOLOWER ${PROJECT_NAME} project_name)
#-----------------------------------------------------------------------------
SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
+SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
#-----------------------------------------------------------------------------
# Force Big Endian emulation on little endian:
-OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Do use if you don't know what you are doing." OFF)
+OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Don't use if you don't know what you are doing." OFF)
CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE
imageElem 0020 1041 "DS" "0.0" // Slice Location
imageElem 0020 4000 "LT" "" // Image Comments
imageElem 0028 0002 "US" "1" // Samples per Pixel
-imageElem 0028 0004 "CS" "" // Photometric Interpretation
+imageElem 0028 0004 "CS" "" // Photometric Interpretation
imageElem 0028 0006 "US" "0" // Planar Configuration
imageElem 0028 0008 "IS" "1" // Number of Frames
imageElem 0028 0010 "US" "0" // Rows
Program: gdcm
Module: $RCSfile: Anonymize.cxx,v $
Language: C++
- Date: $Date: 2006/03/17 14:36:37 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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 0;
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
// if unused Param we give up
if ( am->ArgMgrPrintUnusedLabels() )
// Read the input file.
// ============================================================
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
- f = gdcm::File::New( );
- f->SetLoadMode( gdcm::LD_ALL );
+ f = GDCM_NAME_SPACE::File::New( );
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL );
f->SetFileName( fileName );
int res = f->Load();
// ============================================================
// We need a gdcm::FileHelper, since we want to load the pixels
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
// unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one !
// Feel free to cast if you know it's not.
// The written image will not appear as a 'Secondary Captured image'
// nor as a DERIVED one
- fh->SetContentType(gdcm::UNMODIFIED_PIXELS_IMAGE);
+ fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
fh->WriteDcmExplVR(outputFileName);
std::cout <<"End Anonymize" << std::cout;
Program: gdcm
Module: $RCSfile: AnonymizeDicomDir.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 14:59:58 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \brief AnonymizeDicomDir
*/
-void AnoNoLoad(gdcm::SQItem *s, std::fstream *fp,
+void AnoNoLoad(GDCM_NAME_SPACE::SQItem *s, std::fstream *fp,
uint16_t group, uint16_t elem,
std::string val);
-void AnoNoLoad(gdcm::SQItem *s, std::fstream *fp,
+void AnoNoLoad(GDCM_NAME_SPACE::SQItem *s, std::fstream *fp,
uint16_t group, uint16_t elem,
std::string val)
{
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
uint32_t offset;
uint32_t lgth;
uint32_t valLgth = 0;
if ( d == NULL)
return;
- if ( ! dynamic_cast<gdcm::DataEntry *>(d) )
+ if ( ! dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
return;
offset = d->GetOffset();
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"))
{
// Read the input DICOMDIR
- gdcm::File *f;
- f = gdcm::File::New( );
+ GDCM_NAME_SPACE::File *f;
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(0);
f->SetFileName( fileName );
bool res = f->Load();
std::cout << " ... is readable " << std::endl;
// Look for Directory record sequence
- gdcm::DocEntry *e = f->GetDocEntry(0x0004, 0x1220);
+ GDCM_NAME_SPACE::DocEntry *e = f->GetDocEntry(0x0004, 0x1220);
if ( !e )
{
std::cout << "No Directory Record Sequence (0004,1220) found" <<std::endl;;
return 0;
}
- gdcm::SeqEntry *s = dynamic_cast<gdcm::SeqEntry *>(e);
+ GDCM_NAME_SPACE::SeqEntry *s = dynamic_cast<GDCM_NAME_SPACE::SeqEntry *>(e);
if ( !s )
{
std::cout << "Element (0004,1220) is not a Sequence ?!?" <<std::endl;
// Open the file LTTG (aka ALAP)
std::fstream *fp = new std::fstream(fileName,
std::ios::in | std::ios::out | std::ios::binary);
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
std::string v;
int patientNumber = 0;
std::ostringstream oss;
- gdcm::SQItem *tmpSI=s->GetFirstSQItem(); // For all the SQItems
+ GDCM_NAME_SPACE::SQItem *tmpSI=s->GetFirstSQItem(); // For all the SQItems
while(tmpSI)
{
d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type
- if ( gdcm::DataEntry *dataEntry = dynamic_cast<gdcm::DataEntry *>(d) )
+ if ( GDCM_NAME_SPACE::DataEntry *dataEntry =
+ dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
{
v = dataEntry->GetString();
}
Program: gdcm
Module: $RCSfile: AnonymizeMultiPatient.cxx,v $
Language: C++
- Date: $Date: 2006/06/07 12:22:50 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----- 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"))
{
int verbose = am->ArgMgrDefined("verbose");
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
// ----- Begin Processing -----
- gdcm::DicomDir *dcmdir;
+ GDCM_NAME_SPACE::DicomDir *dcmdir;
// we ask for Directory parsing
- dcmdir = gdcm::DicomDir::New( );
+ dcmdir = GDCM_NAME_SPACE::DicomDir::New( );
dcmdir->SetLoadMode(loadMode);
dcmdir->SetDirectoryName(dirName);
dcmdir->Load();
return 1;
}
- gdcm::DicomDirPatient *pa;
- gdcm::DicomDirStudy *st;
- gdcm::DicomDirSerie *se;
- gdcm::DicomDirImage *im;
+ GDCM_NAME_SPACE::DicomDirPatient *pa;
+ GDCM_NAME_SPACE::DicomDirStudy *st;
+ GDCM_NAME_SPACE::DicomDirSerie *se;
+ GDCM_NAME_SPACE::DicomDirImage *im;
std::string codedName;
std::string fullFileName;
std::string patName;
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
pa = dcmdir->GetFirstPatient();
while ( pa )
{ // on degouline les PATIENT du DICOMDIR
patName = pa->GetEntryString(0x0010, 0x0010);
- codedName = "g^" + gdcm::Util::ConvertToMD5(patName);
+ codedName = "g^" + GDCM_NAME_SPACE::Util::ConvertToMD5(patName);
if (verbose)
std::cout << patName << " --> " << codedName << std::endl;
st = pa->GetFirstStudy();
while ( im )
{ // on degouline les Images de cette serie
fullFileName = dirName;
- fullFileName += gdcm::GDCM_FILESEPARATOR;
+ fullFileName += GDCM_NAME_SPACE::GDCM_FILESEPARATOR;
fullFileName += im->GetEntryString(0x0004, 0x1500);
if (verbose)
std::cout << "FileName " << fullFileName << std::endl;
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( fullFileName );
if ( !f->Load() )
//
// Overwrite the file
//
- // The gdcm::File remains untouched in memory
+ // The GDCM_NAME_SPACE::File remains untouched in memory
f->AnonymizeNoLoad();
Program: gdcm
Module: $RCSfile: AnonymizeNoLoad.cxx,v $
Language: C++
- Date: $Date: 2006/11/15 15:57:49 $
- Version: $Revision: 1.19 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.20 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage") || argc == 1)
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
const char *fileName = am->ArgMgrGetString("filein");
const char *dirName = am->ArgMgrGetString("dirin");
return 0;
}
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
int rubOutNb;
delete am; // ------ we don't need Arguments Manager any longer ------
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
if ( fileName != 0 ) // ====== Deal with a single file ======
{
//
// Parse the input file.
//
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( fileName );
- // gdcm::File::IsReadable() is no usable here, because we deal with
- // any kind of gdcm::Readable *document*
- // not only gdcm::File (as opposed to gdcm::DicomDir)
+ // GDCM_NAME_SPACE::File::IsReadable() is no usable here, because we deal with
+ // any kind of GDCM_NAME_SPACE::Readable *document*
+ // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::DicomDir)
if ( !f->Load() )
{
std::cout <<std::endl
std::cout <<"Let's AnonymizeNoLoad " << std::endl;
- // The gdcm::File remains untouched in memory
+ // The GDCM_NAME_SPACE::File remains untouched in memory
f->AnonymizeNoLoad();
else // ====== Deal with a (single Patient) Directory ======
{
std::cout << "dirName [" << dirName << "]" << std::endl;
- gdcm::DirList dirList(dirName,1); // gets recursively the file list
- gdcm::DirListType fileList = dirList.GetFilenames();
- for( gdcm::DirListType::iterator it = fileList.begin();
+ GDCM_NAME_SPACE::DirList dirList(dirName,1); // gets recursively the file list
+ GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames();
+ for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( it->c_str() );
}
std::cout <<"Let's AnonymizeNoLoad " << it->c_str() << std::endl;
- // The gdcm::File remains untouched in memory
+ // The GDCM_NAME_SPACE::File remains untouched in memory
// The Dicom file is overwritten on disc
f->AnonymizeNoLoad();
Program: gdcm
Module: $RCSfile: ExtractOverlays.cxx,v $
Language: C++
- Date: $Date: 2007/03/16 16:03:04 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----- 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"))
{
const char *dirIn = am->ArgMgrWantString("dirin", usage);
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
if (am->ArgMgrDefined("warning"))
- gdcm::Debug::WarningOn();
+ GDCM_NAME_SPACE::Debug::WarningOn();
// if unused Param we give up
if ( am->ArgMgrPrintUnusedLabels() )
// ======================== more checking on the params ==============
- if ( ! gdcm::DirList::IsDirectory(dirIn) )
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirIn) )
{
std::cout << "KO : [" << dirIn << "] is not a Directory." << std::endl;
return 0;
char outputFileName[1024]; // Hope it's enough for a file name!
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
- gdcm::DirList dirList(dirIn,true); // gets (recursively) the file list
- gdcm::DirListType fileList = dirList.GetFilenames();
- for( gdcm::DirListType::iterator it = fileList.begin();
+ GDCM_NAME_SPACE::DirList dirList(dirIn,true); // gets (recursively) the file list
+ GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames();
+ for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
// Read the input file.
- f = gdcm::File::New( );
- f->SetLoadMode( gdcm::LD_ALL );
+ f = GDCM_NAME_SPACE::File::New( );
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL );
f->SetFileName( it->c_str() );
f->AddForceLoadElement(0x6000,0x3000); // Overlay Data
uint16_t ovlyGroup = 0x6000;
- gdcm::DataEntry *e = f->GetDataEntry(ovlyGroup, 0x3000);
+ GDCM_NAME_SPACE::DataEntry *e = f->GetDataEntry(ovlyGroup, 0x3000);
if (e == 0)
{
std::cout << " Image doesn't contain any Overlay " << std::endl;
// ============================================================
// Write a new file
// ============================================================
- gdcm::File *f2;
- f2 = gdcm::File::New( );
+ GDCM_NAME_SPACE::File *f2;
+ f2 = GDCM_NAME_SPACE::File::New( );
char temp[256];
// feel free to add any field (Dicom Data Entry) you like, here.
// ...
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f2);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f2);
fh->SetImageData(outputData,dimXY);
fh->WriteDcmExplVR(outputFileName);
Program: gdcm
Module: $RCSfile: FindTags.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:26 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.17 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
std::string fileName;
- gdcm::FileHelper *h;
- gdcm::File *f = gdcm::File::New();
+ GDCM_NAME_SPACE::FileHelper *h;
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
if(argc > 1 )
f->Load();
// Should test if it worked !
- h = gdcm::FileHelper::New(f);
+ h = GDCM_NAME_SPACE::FileHelper::New(f);
std::string ManufacturerName="SIEMENS ";
std::string RecCode="ACR-NEMA 2.0";
// existerait-il qq chose qui marche à tout coup?
// Location
- std::string zizi = gdcm::Util::Format("%f",l);
- Location = gdcm::Util::DicomString(zizi.c_str());
+ std::string zizi = GDCM_NAME_SPACE::Util::Format("%f",l);
+ Location = GDCM_NAME_SPACE::Util::DicomString(zizi.c_str());
h->SetEntryString(Location, 0x0020,0x0050);
// sinon, la longueur du champ est erronée (?!?)
// Image Location
- zizi = gdcm::Util::Format("%d",0x7FE0);
- ImageLocation = gdcm::Util::DicomString(zizi.c_str());
+ zizi = GDCM_NAME_SPACE::Util::Format("%d",0x7FE0);
+ ImageLocation = GDCM_NAME_SPACE::Util::DicomString(zizi.c_str());
//h->SetEntryString(Location, 0x0028,0x0200);
//h->GetFile()->SetEntryLength(strlen(ImageLocation.c_str())-1, 0x0020,0x0050); // prudence !
Program: gdcm
Module: $RCSfile: MakeDicomDir.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 14:59:58 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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"))
{
const char *name;
name = am->ArgMgrGetString("name","DICOMDIR");
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
int check = am->ArgMgrDefined("check");
// ----- Begin Processing -----
- gdcm::DicomDir *dcmdir;
+ GDCM_NAME_SPACE::DicomDir *dcmdir;
// we ask for Directory parsing
- dcmdir = gdcm::DicomDir::New( );
+ dcmdir = GDCM_NAME_SPACE::DicomDir::New( );
dcmdir->SetLoadMode(loadMode);
dcmdir->SetDirectoryName(dirName);
// struct tms tms1, tms2; // Time measurements
// times(&tms1);
- dcmdir->Load(); // Reads all the files and creates the gdcm::DicomDir
+ dcmdir->Load(); // Reads all the files and creates the GDCM_NAME_SPACE::DicomDir
//times(&tms2);
//std::cout
// << (long) ((tms2.tms_utime) - (tms1.tms_utime))
// << std::endl;
- if ( gdcm::Debug::GetDebugFlag() )
+ if ( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "======================= End Parsing Directory" << std::endl;
// ----- Check the result
return 1;
}
- // ----- Writes the corresponding DICOMDIR file (from the gdcm::DicomDir)
+ // ----- Writes the corresponding DICOMDIR file (from the GDCM_NAME_SPACE::DicomDir)
dcmdir->Write(name);
dcmdir->Delete();
if (check)
{
- if ( gdcm::Debug::GetDebugFlag() )
+ if ( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "======================= End Writting DICOMDIR"
<< std::endl;
// Read from disc the just written DicomDir
- gdcm::DicomDir *newDicomDir = gdcm::DicomDir::New();
+ GDCM_NAME_SPACE::DicomDir *newDicomDir = GDCM_NAME_SPACE::DicomDir::New();
newDicomDir->SetFileName( name );
newDicomDir->Load();
- if ( gdcm::Debug::GetDebugFlag() )
+ if ( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "======================= End Parsing DICOMDIR"
<< std::endl;
if( !newDicomDir->IsReadable() )
Program: gdcm
Module: $RCSfile: PatchHeader.cxx,v $
Language: C++
- Date: $Date: 2006/03/01 09:51:56 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// global variables will be seen inside any function.
-gdcm::File *f;
+GDCM_NAME_SPACE::File *f;
std::fstream *fp;
uint16_t samplesperpixel;
void update()
{
uint32_t offset;
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
//
// Fields to replace.
//
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage") || argc == 1)
{
pixelrepresentation = am->ArgMgrWantInt("pixelrepresentation",usage);
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
/* if unused Param we give up */
//
// Parse the input file.
//
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( fileName );
bool res = f->Load();
- // gdcm::File::IsReadable() is no usable here, because we deal with
- // any kind of gdcm::Readable *document*
- // not only gdcm::File (as opposed to gdcm::DicomDir)
+ // GDCM_NAME_SPACE::File::IsReadable() is no usable here, because we deal with
+ // any kind of GDCM_NAME_SPACE::Readable *document*
+ // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::DicomDir)
if ( !res )
{
std::cout <<std::endl
else // ====== Deal with a (single Patient) Directory ======
{
std::cout << "dirName [" << dirName << "]" << std::endl;
- gdcm::DirList dirList(dirName,1); // gets recursively the file list
- gdcm::DirListType fileList = dirList.GetFilenames();
- for( gdcm::DirListType::iterator it = fileList.begin();
+ GDCM_NAME_SPACE::DirList dirList(dirName,1); // gets recursively the file list
+ GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames();
+ for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( it->c_str() );
bool res = f->Load();
Program: gdcm
Module: $RCSfile: PrintDicomDir.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 16:03:31 $
- Version: $Revision: 1.35 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.36 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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 0;
}
- gdcm::DicomDir *f;
- gdcm::TSKey v;
-
- gdcm::DicomDirPatient *pa;
- gdcm::DicomDirStudy *st;
- gdcm::DicomDirSerie *se;
- gdcm::DicomDirVisit *vs;
- gdcm::DicomDirImage *im;
- gdcm::DicomDirPrivate *pr;
+ GDCM_NAME_SPACE::DicomDir *f;
+ GDCM_NAME_SPACE::TSKey v;
+
+ GDCM_NAME_SPACE::DicomDirPatient *pa;
+ GDCM_NAME_SPACE::DicomDirStudy *st;
+ GDCM_NAME_SPACE::DicomDirSerie *se;
+ GDCM_NAME_SPACE::DicomDirVisit *vs;
+ GDCM_NAME_SPACE::DicomDirImage *im;
+ GDCM_NAME_SPACE::DicomDirPrivate *pr;
char *fileName;
fileName = am->ArgMgrWantString("filein",usage);
int detailLevel = am->ArgMgrGetInt("detail", 2);
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
if (am->ArgMgrDefined("warning"))
- gdcm::Debug::WarningOn();
+ GDCM_NAME_SPACE::Debug::WarningOn();
/* if unused Param we give up */
if ( am->ArgMgrPrintUnusedLabels() )
// new gdcm2 style
- f = gdcm::DicomDir::New();
+ f = GDCM_NAME_SPACE::DicomDir::New();
f->SetFileName ( fileName );
f->Load( );
// Previous code.
// Kept as an example. Please don't remove
- gdcm::ListDicomDirPatient::const_iterator itPatient;
- gdcm::ListDicomDirStudy::const_iterator itStudy;
- gdcm::ListDicomDirSerie::const_iterator itSerie;
- gdcm::ListDicomDirImage::const_iterator itImage;
+ GDCM_NAME_SPACE::ListDicomDirPatient::const_iterator itPatient;
+ GDCM_NAME_SPACE::ListDicomDirStudy::const_iterator itStudy;
+ GDCM_NAME_SPACE::ListDicomDirSerie::const_iterator itSerie;
+ GDCM_NAME_SPACE::ListDicomDirImage::const_iterator itImage;
cout << std::endl << std::endl
<< " = Liste des PATIENT/STUDY/SERIE/IMAGE ==================================="
<< std::endl<< std::endl;
Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2006/11/15 15:57:49 $
- Version: $Revision: 1.83 $
+ 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);
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();
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") )
{
}
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;
+ 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);
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 *f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode(loadMode);
f->SetFileName( fileName );
bool res = f->Load();
- // gdcm::File::IsReadable() is no usable here, because we deal with
+ // GDCM_NAME_SPACE::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)
+ // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::DicomDir)
if ( !res )
{
std::cout << "Cannot process file [" << fileName << "]" << std::endl;
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::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 << "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::GDCM_UNFOUND
+ 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::GDCM_UNFOUND
+ if ( strImagePositionPatientRET != GDCM_NAME_SPACE::GDCM_UNFOUND
&& strImagePositionPatientRET != "" )
std::cout << "ImagePositionPatientRET (0x0020,0x0030)= ["
<< strImagePositionPatientRET << "]" << std::endl;
// Let's compute 'user friendly' results about 'Orientation'
// ---------------------------------------------------------
- gdcm::Orientation *o = gdcm::Orientation::New();
+ 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;
// 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);
{
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);
}
- // Parsability of the gdcm::Document already checked, after Load() !
+ // Parsability of the GDCM_NAME_SPACE::Document already checked, after Load() !
if ( f->IsReadable() )
{
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;
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::Orientation::New();
+ 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;
Program: gdcm
Module: $RCSfile: RawToDicom.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:01:47 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// 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") )
{
char *pixelType = am->ArgMgrWantString("pixeltype", usage);
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
/* if unused Param we give up */
if ( am->ArgMgrPrintUnusedLabels() )
return 0;
}
- bool bigEndian = gdcm::Util::IsCurrentProcessorBigEndian();
+ bool bigEndian = GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian();
std::string strPixelType(pixelType);
int pixelSign;
// Create an empty FileHelper
- gdcm::FileHelper *fileH = gdcm::FileHelper::New();
+ GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New();
// Get the (empty) image header.
- gdcm::File *fileToBuild = fileH->GetFile();
+ GDCM_NAME_SPACE::File *fileToBuild = fileH->GetFile();
// If you want to use this program as a template to create
// keeping the same 'Study Instance UID' for various images
// The user may add images to a 'Manufacturer Study',
// adding new Series to an already existing Study
- std::string studyUID = gdcm::Util::CreateUniqueUID();
+ std::string studyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
fileToBuild->InsertEntryString(studyUID, 0x0020,0x000d,"UI");
// 'Serie Instance UID'
// keeping the same 'Serie Instance UID' for various images
// The user shouldn't add any image to a 'Manufacturer Serie'
// but there is no way no to prevent him for doing that
- std::string serieUID = gdcm::Util::CreateUniqueUID();
+ std::string serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
fileToBuild->InsertEntryString(serieUID, 0x0020,0x000e,"UI");
// end of 'keep out of loop lines
Program: gdcm
Module: $RCSfile: ReWrite.cxx,v $
Language: C++
- Date: $Date: 2007/03/29 13:49:32 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.26 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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"))
{
const char *mode = am->ArgMgrGetString("mode","X");
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
bool rgb = ( 0 != am->ArgMgrDefined("RGB") );
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
if (am->ArgMgrDefined("warning"))
- gdcm::Debug::WarningOn();
+ GDCM_NAME_SPACE::Debug::WarningOn();
bool fail = false;
int *boundVal;
// ----------- End Arguments Manager ---------
- gdcm::File *f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode( loadMode );
f->SetFileName( fileName );
bool res = f->Load();
}
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
void *imageData;
int dataSize;
// Since we just ReWrite the image, we know no modification
// was performed on the pixels.
// We don't want this image appears as a 'Secondary Captured image'
- fh->SetContentType(gdcm::UNMODIFIED_PIXELS_IMAGE);
+ fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
/// \todo : think about rubbing out a part of a *multiframe* image!
Program: gdcm
Module: $RCSfile: ReWriteExtended.cxx,v $
Language: C++
- Date: $Date: 2007/03/29 12:02:22 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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"))
{
const char *mode = am->ArgMgrGetString("mode","X");
- int filecontent = am->ArgMgrGetInt("filecontent", gdcm::UNMODIFIED_PIXELS_IMAGE);
+ int filecontent = am->ArgMgrGetInt("filecontent", GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
bool rgb = ( 0 != am->ArgMgrDefined("RGB") );
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
// ----------- End Arguments Manager ---------
- gdcm::File *f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode( loadMode );
f->SetFileName( fileName );
bool res = f->Load();
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
void *imageData;
int dataSize;
// We trust user. (just an example; *never* trust an user !)
- fh->SetContentType((gdcm::ImageContentType)filecontent);
+ fh->SetContentType((GDCM_NAME_SPACE::ImageContentType)filecontent);
/// \todo Here, give the detail of operations a 'decent' user should perform,
/// according to what *he* wants to do.
// an user shouldn't add images to a 'native' serie.
// He is allowed to create his own Serie, within a 'native' Study :
- // if he wants to do so, he has to call gdcm::Util::GetUniqueUID
+ // if he wants to do so, he has to call GDCM_NAME_SPACE::Util::GetUniqueUID
// only once for a given image set, belonging to a single 'user Serie'
std::string SerieInstanceUID;
switch(filecontent)
{
- case gdcm::USER_OWN_IMAGE :
- SerieInstanceUID = gdcm::Util::CreateUniqueUID();
+ case GDCM_NAME_SPACE::USER_OWN_IMAGE :
+ SerieInstanceUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
f->SetEntryString(SerieInstanceUID,0x0020,0x000e);
break;
- case gdcm::FILTERED_IMAGE :
+ case GDCM_NAME_SPACE::FILTERED_IMAGE :
/// \todo : to be finished!
break;
- case gdcm::CREATED_IMAGE :
+ case GDCM_NAME_SPACE::CREATED_IMAGE :
/// \todo : to be finished!
break;
- case gdcm::UNMODIFIED_PIXELS_IMAGE :
+ case GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE :
/// \todo : to be finished!
break;
}
Program: gdcm
Module: $RCSfile: TestValidate.cxx,v $
Language: C++
- Date: $Date: 2005/11/18 11:09:06 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
const char *filename = argv[1];
- gdcm::File *input = gdcm::File::New( );
+ GDCM_NAME_SPACE::File *input = GDCM_NAME_SPACE::File::New( );
input->SetFileName(filename);
input->Load();
- gdcm::Validator *v = gdcm::Validator::New();
+ GDCM_NAME_SPACE::Validator *v = GDCM_NAME_SPACE::Validator::New();
v->SetInput( input );
return 0;
Program: gdcm
Module: $RCSfile: ToInTag.cxx,v $
Language: C++
- Date: $Date: 2007/02/26 08:47:29 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* converted into a Brucker-like Dicom, Intags compliant
*/
-typedef std::map<std::string, gdcm::File*> SortedFiles;
+typedef std::map<std::string, GDCM_NAME_SPACE::File*> SortedFiles;
int main(int argc, char *argv[])
{
// ----- 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"))
{
const char *dirNameout;
dirNameout = am->ArgMgrGetString("dirout",".");
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
int verbose = am->ArgMgrDefined("verbose");
int split = am->ArgMgrDefined("split");
// ----- Begin Processing -----
- if ( ! gdcm::DirList::IsDirectory(dirNamein) )
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirNamein) )
{
std::cout << "KO : [" << dirNamein << "] is not a Directory." << std::endl;
return 0;
std::cout << "Check for output directory :[" << dirNameout << "]."
<<std::endl;
- if ( ! gdcm::DirList::IsDirectory(dirNameout) ) // dirout not found
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirNameout) ) // dirout not found
{
std::string strDirNameout(dirNameout); // to please gcc 4
systemCommand = "mkdir " +strDirNameout; // create it!
if (verbose)
std::cout << systemCommand << std::endl;
system (systemCommand.c_str());
- if ( ! gdcm::DirList::IsDirectory(dirNameout) ) // be sure it worked
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirNameout) ) // be sure it worked
{
std::cout << "KO : not a dir : [" << dirNameout << "] (creation failure ?)" << std::endl;
return 0;
}
std::string strDirNamein(dirNamein);
- gdcm::DirList dirList(strDirNamein, true); // get recursively the list of files
+ GDCM_NAME_SPACE::DirList dirList(strDirNamein, true); // get recursively the list of files
if (listonly)
{
std::cout << std::endl;
}
- gdcm::DirListType fileNames;
+ GDCM_NAME_SPACE::DirListType fileNames;
fileNames = dirList.GetFilenames();
- gdcm::SerieHelper *s; // Needed only to may use SerieHelper::AddSeriesDetail()
- s = gdcm::SerieHelper::New();
+ GDCM_NAME_SPACE::SerieHelper *s; // Needed only to may use SerieHelper::AddSeriesDetail()
+ s = GDCM_NAME_SPACE::SerieHelper::New();
std::string token = "%%%"; // Hope it's enough!
/*
s->Print();
*/
- gdcm::File *f;
- gdcm::FileHelper *fh;
+ GDCM_NAME_SPACE::File *f;
+ GDCM_NAME_SPACE::FileHelper *fh;
std::vector<std::string> tokens;
std::vector<std::string> tokensForFileName;
// For Siemens pb, we need Station Name
- gdcm::DirListType::iterator it1 = fileNames.begin();
- f = gdcm::File::New();
- f->SetLoadMode(gdcm::LD_ALL);
+ GDCM_NAME_SPACE::DirListType::iterator it1 = fileNames.begin();
+ f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode(GDCM_NAME_SPACE::LD_ALL);
f->SetFileName( *it1 );
f->Load();
std::string stationName = f->GetEntryString(0x0008,0x1010);
<< std::endl;
std::string uniqueSeriesIdentifier;
- for (gdcm::DirListType::iterator it) = fileNames.begin();
+ for (GDCM_NAME_SPACE::DirListType::iterator it) = fileNames.begin();
it != fileNames.end();
++it)
{
std::cout << "File Name : " << *it << std::endl;
- f = gdcm::File::New();
- f->SetLoadMode(gdcm::LD_ALL);
+ f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode(GDCM_NAME_SPACE::LD_ALL);
f->SetFileName( *it );
f->Load();
//uint8_t *imageData; // Useless : pixels will not be loaded
// (images are overwritten)
- for (gdcm::DirListType::iterator it = fileNames.begin();
+ for (GDCM_NAME_SPACE::DirListType::iterator it = fileNames.begin();
it != fileNames.end();
++it)
{
- f = gdcm::File::New();
+ f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode(loadMode);
f->SetFileName( *it );
f->Load();
userFileIdentifier=s->CreateUserDefinedFileIdentifier(f);
tokens.clear();
- gdcm::Util::Tokenize (userFileIdentifier, tokens, token);
+ GDCM_NAME_SPACE::Util::Tokenize (userFileIdentifier, tokens, token);
int imageNum; // Within FileName
char newName[1024];
{
///this is a trick to build up a lexicographical compliant name :
/// eg : fich001.ima vs fich100.ima as opposed to fich1.ima vs fich100.ima
- std::string name = gdcm::Util::GetName( *it );
+ std::string name = GDCM_NAME_SPACE::Util::GetName( *it );
if (hasSkel)
{
- gdcm::Util::Tokenize (name, tokensForFileName, skel);
+ GDCM_NAME_SPACE::Util::Tokenize (name, tokensForFileName, skel);
imageNum = atoi ( tokensForFileName[0].c_str() );
// probabely we could write something much more complicated using C++ !
sprintf (newName, "%s%06d%s", skel, imageNum, extent);
std::string fullWriteFilename;
std::string strExtent(extent);
- writeDir = gdcm::Util::NormalizePath(dirNameout);
+ writeDir = GDCM_NAME_SPACE::Util::NormalizePath(dirNameout);
SortedFiles::iterator it2;
previousPatientName = "";
int flag = 0;
- gdcm::File *currentFile;
+ GDCM_NAME_SPACE::File *currentFile;
- std::string defaultStudyUID = gdcm::Util::CreateUniqueUID();
+ std::string defaultStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
std::string defaultSerieUID;
for (it2 = sf.begin() ; it2 != sf.end(); ++it2)
currentFile = it2->second;
fullFilename = currentFile->GetFileName();
- lastFilename = gdcm::Util::GetName( fullFilename );
+ lastFilename = GDCM_NAME_SPACE::Util::GetName( fullFilename );
std::cout << " --------------------------------------------------"
<< " Rewrite [" <<lastFilename << "]" << std::endl;
tokens.clear();
- gdcm::Util::Tokenize (it2->first, tokens, token);
+ GDCM_NAME_SPACE::Util::Tokenize (it2->first, tokens, token);
currentPatientName = tokens[0];
currentSerieInstanceUID = tokens[1];
currentImagePosition[0] = 'P';
// Add a default ImagePositionPatient to avoid confusion at post processing time
- if ( currentFile->GetEntryString(0x0020,0x0032) == gdcm::GDCM_UNFOUND &&
- currentFile->GetEntryString(0x0020,0x0030) == gdcm::GDCM_UNFOUND )
+ if ( currentFile->GetEntryString(0x0020,0x0032) == GDCM_NAME_SPACE::GDCM_UNFOUND &&
+ currentFile->GetEntryString(0x0020,0x0030) == GDCM_NAME_SPACE::GDCM_UNFOUND )
{
currentFile->InsertEntryString("0.\\0.\\0.",0x0020, 0x0032, "DS" );
}
// Add a default ImagePositionPatient to avoid confusion at post processing time
- if ( currentFile->GetEntryString(0x0020,0x0037) == gdcm::GDCM_UNFOUND &&
- currentFile->GetEntryString(0x0020,0x0035) == gdcm::GDCM_UNFOUND )
+ if ( currentFile->GetEntryString(0x0020,0x0037) == GDCM_NAME_SPACE::GDCM_UNFOUND &&
+ currentFile->GetEntryString(0x0020,0x0035) == GDCM_NAME_SPACE::GDCM_UNFOUND )
{
currentFile->InsertEntryString("1.\\0.\\0.\\0.\\1.\\0.",0x0020, 0x0037, "DS" );
}
if (previousPatientName != currentPatientName)
{
- if ( currentFile->GetEntryString(0x0020,0x000d) == gdcm::GDCM_UNFOUND)
+ if ( currentFile->GetEntryString(0x0020,0x000d) == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
if (verbose)
std::cout << "--- new Study UID created" << std::endl;
- defaultStudyUID = gdcm::Util::CreateUniqueUID();
+ defaultStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
currentFile->InsertEntryString(defaultStudyUID, 0x0020, 0x000d, "UI" );
}
previousPhaseEncodingDirection = ""; //currentPhaseEncodingDirection;
currentPatientWriteDir = writeDir + currentPatientName;
- //if ( ! gdcm::DirList::IsDirectory(currentPatientWriteDir) )
+ //if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(currentPatientWriteDir) )
{
systemCommand = "mkdir " + currentPatientWriteDir;
if (verbose)
std::cout << "==== === new Serie [" << currentSerieInstanceUID << "]"
<< std::endl;
- if ( currentFile->GetEntryString(0x0020,0x000e) == gdcm::GDCM_UNFOUND)
+ if ( currentFile->GetEntryString(0x0020,0x000e) == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
if (verbose)
std::cout << "--- --- new Serie UID created" << std::endl;
- defaultSerieUID = gdcm::Util::CreateUniqueUID();
+ defaultSerieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
currentFile->InsertEntryString(defaultSerieUID, 0x0020, 0x000e, "UI" );
}
if (split)
{
- currentSerieWriteDir = currentPatientWriteDir + gdcm::GDCM_FILESEPARATOR
+ currentSerieWriteDir = currentPatientWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ currentSerieInstanceUID;
systemCommand = "mkdir " + currentSerieWriteDir;
system (systemCommand.c_str());
<< std::endl;
if (split)
{
- currentPositionWriteDir = currentSerieWriteDir + gdcm::GDCM_FILESEPARATOR
+ currentPositionWriteDir = currentSerieWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ currentImagePosition;
systemCommand = "mkdir " + currentPositionWriteDir;
system (systemCommand.c_str());
if (split)
{
currentPhaseEncodingDirectionWriteDir = currentPositionWriteDir
- + gdcm::GDCM_FILESEPARATOR
+ + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ currentPhaseEncodingDirection;
systemCommand = "mkdir " + currentPhaseEncodingDirectionWriteDir;
system (systemCommand.c_str());
std::cout << "--- --- --- --- --- " << (it2->second)->GetFileName()
<< std::endl;
- if ( gdcm::Debug::GetDebugFlag())
+ if ( GDCM_NAME_SPACE::Debug::GetDebugFlag())
std::cout << "--- --- --- --- --- " << it2->first << " "
<< (it2->second)->GetFileName() << " "
- << gdcm::Util::GetName( fullFilename ) << std::endl;
+ << GDCM_NAME_SPACE::Util::GetName( fullFilename ) << std::endl;
// Transform the image to be 'Brucker-Like'
// ----------------------------------------
std::string strImagePositionPatient = currentFile->GetEntryString(0x0020, 0x0032 );
- if (strImagePositionPatient == gdcm::GDCM_UNFOUND)
+ if (strImagePositionPatient == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
if (verbose)
std::cout << "Duplicate ImagePosition into ImagePositionPatient" << std::endl;
}
std::string strImageOrientationPatient = f->GetEntryString(0x0020, 0x0037 );
- if (strImageOrientationPatient == gdcm::GDCM_UNFOUND)
+ if (strImageOrientationPatient == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
if (verbose)
std::cout << "Duplicate ImageOrientation into ImageOrientationPatient" << std::endl;
if (split)
- //fullWriteFilename = currentPhaseEncodingDirectionWriteDir + gdcm::GDCM_FILESEPARATOR
+ //fullWriteFilename = currentPhaseEncodingDirectionWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
// + lastFilename + strExtent;
- fullWriteFilename = currentPositionWriteDir + gdcm::GDCM_FILESEPARATOR
+ fullWriteFilename = currentPositionWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ lastFilename + strExtent;
else
- fullWriteFilename = currentPatientWriteDir + gdcm::GDCM_FILESEPARATOR
+ fullWriteFilename = currentPatientWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ lastFilename + strExtent;
/*
// Load the pixels in RAM.
- fh = gdcm::FileHelper::New(currentFile);
+ fh = GDCM_NAME_SPACE::FileHelper::New(currentFile);
uint8_t *imageData = fh->GetImageDataRaw(); // Don't convert (Gray Pixels + LUT) into (RGB pixels) ?!?
fh->SetWriteTypeToDcmExplVR();
// We didn't modify pixels -> keep unchanged the following :
for(int x=nX/3; x<nX/2+50; x++)
imageData[ y*nX*2 + x ] = 0;
- fh->SetContentType(gdcm::UNMODIFIED_PIXELS_IMAGE);
+ fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
if (!fh->Write(fullWriteFilename))
{
std::cout << "Fail to write :[" << fullWriteFilename << "]"
Program: gdcm
Module: $RCSfile: ToMRIregister.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:01:48 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <sstream>
-bool AquisitionTime_0008_0032_Compare(gdcm::File *file1, gdcm::File *file2);
+bool AquisitionTime_0008_0032_Compare(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2);
-bool AquisitionTime_0008_0032_Compare(gdcm::File *file1, gdcm::File *file2)
+bool AquisitionTime_0008_0032_Compare(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2)
{
return file1->GetEntryString(0x0008,0x0032) < file2->GetEntryString(0x0008,0x0032);
}
"\n ToMriregister :\n ",
" - Converts the Siemens Sonata MRI '*tfl2d1' ",
" to be processable by MriRegister software ",
- " - May be used as a template for gdcm::SerieHelper use. ",
+ " - May be used as a template for GDCM_NAME_SPACE::SerieHelper use. ",
" ",
"usage: ToMriRegister dirin=inputDirectoryName ",
" dirout=outputDirectoryName ",
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage") || argc == 1)
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
int verbose = am->ArgMgrDefined("verbose");
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
const char *dirIn = am->ArgMgrGetString("dirin");
// ======================== more checking on the params ==============
- if ( ! gdcm::DirList::IsDirectory(dirIn) )
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirIn) )
{
std::cout << "KO : [" << dirIn << "] is not a Directory." << std::endl;
return 0;
if (verbose)
std::cout << "Check for output directory :[" << dirOut << "]."
<<std::endl;
- if ( ! gdcm::DirList::IsDirectory(dirOut) ) // dirout not found
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirOut) ) // dirout not found
{
systemCommand = "mkdir " + strDirNameout; // create it!
if (verbose)
std::cout << systemCommand << std::endl;
system (systemCommand.c_str());
- if ( ! gdcm::DirList::IsDirectory(dirOut) ) // be sure it worked
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirOut) ) // be sure it worked
{
std::cout << "KO : not a dir : [" << dirOut
<< "] (creation failure ?)" << std::endl;
// Just to see *all* the file names:
- gdcm::DirList dirList(dirIn,true); // gets (recursively) the file list
- gdcm::DirListType fileList = dirList.GetFilenames();
- for( gdcm::DirListType::iterator it = fileList.begin();
+ GDCM_NAME_SPACE::DirList dirList(dirIn,true); // gets (recursively) the file list
+ GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames();
+ for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
std::cout << "file [" << it->c_str() << "]" << std::endl;
}
- gdcm::SerieHelper *s;
+ GDCM_NAME_SPACE::SerieHelper *s;
- s = gdcm::SerieHelper::New();
- s->SetLoadMode(gdcm::LD_NOSEQ); // Don't load Sequences
+ s = GDCM_NAME_SPACE::SerieHelper::New();
+ s->SetLoadMode(GDCM_NAME_SPACE::LD_NOSEQ); // Don't load Sequences
// we could choose to ignore some Files
- //gdcm::TagKey t(0x0010,0x0024); // [Sequence Name]
+ //GDCM_NAME_SPACE::TagKey t(0x0010,0x0024); // [Sequence Name]
// Keep only files where restriction is true
- //s->AddRestriction(t, "*tfl2d1 ", gdcm::GDCM_EQUAL);
+ //s->AddRestriction(t, "*tfl2d1 ", GDCM_NAME_SPACE::GDCM_EQUAL);
s->SetDirectory(dirIn, true); // true : recursive exploration
std::ostringstream str;
- gdcm::XCoherentFileSetmap xcm;
- gdcm::FileHelper *fh;
+ GDCM_NAME_SPACE::XCoherentFileSetmap xcm;
+ GDCM_NAME_SPACE::FileHelper *fh;
// will be used for ordering.
s->SetUserLessThanFunction(AquisitionTime_0008_0032_Compare);
int sliceNumber = 0;
int imageNumber = 0;
- // For all the Single SerieUID Files Sets of the gdcm::Serie
- gdcm::FileList *l = s->GetFirstSingleSerieUIDFileSet();
+ // For all the Single SerieUID Files Sets of the GDCM_NAME_SPACE::Serie
+ GDCM_NAME_SPACE::FileList *l = s->GetFirstSingleSerieUIDFileSet();
char numero[5];
while (l)
float position =0.0;
char charPosition[10];
- for (gdcm::XCoherentFileSetmap::iterator i = xcm.begin();
+ for (GDCM_NAME_SPACE::XCoherentFileSetmap::iterator i = xcm.begin();
i != xcm.end();
++i)
{
sprintf(charPosition, "%f", position);
//int imageNumber = 0;
- for ( gdcm::FileList::iterator it = ((*i).second)->begin();
+ for ( GDCM_NAME_SPACE::FileList::iterator it = ((*i).second)->begin();
it != ((*i).second)->end();
++it)
{
// Load the pixels in RAM.
- fh = gdcm::FileHelper::New(*it);
+ fh = GDCM_NAME_SPACE::FileHelper::New(*it);
uint8_t *imageData = fh->GetImageDataRaw(); // Don't convert (Gray Pixels + LUT) into (RGB pixels) ?!?
if (!imageData)
std::cout << "fail to read [" << (*it)->GetFileName() << std::endl;
fh->SetWriteTypeToAcr();
- fh->SetContentType(gdcm::UNMODIFIED_PIXELS_IMAGE);
+ fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
// forge the file name
fullFilename = (*it)->GetFileName();
- lastFilename = gdcm::Util::GetName( fullFilename );
- //fullWriteFilename = strDirNameout + gdcm::GDCM_FILESEPARATOR
+ lastFilename = GDCM_NAME_SPACE::Util::GetName( fullFilename );
+ //fullWriteFilename = strDirNameout + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
// + lastFilename;
sprintf(fullWriteFilename, "%s%c%04d-%04d-%04d.dcm",
- dirOut, gdcm::GDCM_FILESEPARATOR,
+ dirOut, GDCM_NAME_SPACE::GDCM_FILESEPARATOR,
serieNumber, sliceNumber, imageNumber);
if (verbose)
// show [sliceLocation 0x0020,1041 (if any)] old name, -> newname
std::string strSliceLocation;
/*
- gdcm::DataEntry e = (*it)->GetDataEntry(0x0020,0x1041);
+ GDCM_NAME_SPACE::DataEntry e = (*it)->GetDataEntry(0x0020,0x1041);
if (e)
strSliceLocation = e->GetString();
else
Program: gdcm
Module: $RCSfile: Volume2Dicom.cxx,v $
Language: C++
- Date: $Date: 2006/01/27 10:03:23 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
////////////////////////////////////////////////////////////
// Create a new dicom header and fill in some info //
////////////////////////////////////////////////////////////
- gdcm::File *f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
////////////////////////////////////////////////////////////
// Create a new dicom file object from the header //
////////////////////////////////////////////////////////////
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
uint8_t *myData = fh->GetImageData(); // Get an Image pointer
fh->SetImageData( myData, sliceSize); // This callback ensures that the internal
// Pixel_Data of fh is set correctly
memcpy(myData,imageData+z*sizex*sizey,sliceSize);
// write the image
- std::string filename = directory + gdcm::Util::Format("%Image_%05d.dcm", z);
+ std::string filename = directory + GDCM_NAME_SPACE::Util::Format("%Image_%05d.dcm", z);
std::cout << "Writing file " << filename;
fh->WriteDcmExplVR(filename);
std::cout << " OK" << std::endl;
Program: gdcm
Module: $RCSfile: WriteDicomAsJPEG.cxx,v $
Language: C++
- Date: $Date: 2006/08/18 16:08:16 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.14 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Item tag:
uint16_t group = 0xfffe;
uint16_t elem = 0xe000;
- gdcm::binary_write(*fp, group);
- gdcm::binary_write(*fp, elem);
+ GDCM_NAME_SPACE::binary_write(*fp, group);
+ GDCM_NAME_SPACE::binary_write(*fp, elem);
// Item Length
uint32_t dummy = 0x12345678;
size_t offset = fp->tellp();
JpegPair jp;
jp.first = offset;
v.push_back(jp);
- gdcm::binary_write(*fp, dummy);
+ GDCM_NAME_SPACE::binary_write(*fp, dummy);
}
// PS 3.5, page 66
// Item tag:
uint16_t group = 0xfffe;
uint16_t elem = 0xe000;
- gdcm::binary_write(*fp, group);
- gdcm::binary_write(*fp, elem);
+ GDCM_NAME_SPACE::binary_write(*fp, group);
+ GDCM_NAME_SPACE::binary_write(*fp, elem);
// Item Length
uint32_t item_length = 0x0000;
- gdcm::binary_write(*fp, item_length);
+ GDCM_NAME_SPACE::binary_write(*fp, item_length);
}
// Item tag:
uint16_t group = 0xfffe;
uint16_t elem = 0xe000;
- gdcm::binary_write(*fp, group);
- gdcm::binary_write(*fp, elem);
+ GDCM_NAME_SPACE::binary_write(*fp, group);
+ GDCM_NAME_SPACE::binary_write(*fp, elem);
// Item Length
uint32_t item_length = numFrag*4; // sizeof(uint32_t)
- gdcm::binary_write(*fp, item_length);
+ GDCM_NAME_SPACE::binary_write(*fp, item_length);
// Just prepare the space
start = fp->tellp(); //to be able to rewind
for(int i=0; i<numFrag;++i)
{
uint32_t dummy = 0x0000;
- gdcm::binary_write(*fp, dummy);
+ GDCM_NAME_SPACE::binary_write(*fp, dummy);
}
}
const JpegPair &jp = *i;
if(i == v.begin() ){ assert( jp.first - first.first == 0); }
uint32_t offset = jp.first - first.first;
- gdcm::binary_write(*fp, offset);
+ GDCM_NAME_SPACE::binary_write(*fp, offset);
//std::cerr << "Updating Table:" << jp.first - first.first << std::endl;
}
}
const JpegPair &jp = *i;
fp->seekp( jp.first );
uint32_t length = jp.second;
- gdcm::binary_write(*fp, length );
+ GDCM_NAME_SPACE::binary_write(*fp, length );
//std::cerr << "Updating:" << jp.first << "," << jp.second << std::endl;
}
}
// sequence terminator
uint16_t group = 0xfffe;
uint16_t elem = 0xe000;
- gdcm::binary_write(*fp, group);
- gdcm::binary_write(*fp, elem);
+ GDCM_NAME_SPACE::binary_write(*fp, group);
+ GDCM_NAME_SPACE::binary_write(*fp, elem);
uint32_t length = 0x0;
- gdcm::binary_write(*fp, length);
+ GDCM_NAME_SPACE::binary_write(*fp, length);
// Jpeg is done, now update the frag length
UpdateJpegFragmentSize(fp, v);
std::cerr << "Using quality: " << quality << std::endl;
// Step 1 : Create the header of the image
- gdcm::File *f = gdcm::File::New();
- f->SetLoadMode ( gdcm::LD_ALL ); // Load everything
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode ( GDCM_NAME_SPACE::LD_ALL ); // Load everything
f->SetFileName( filename );
f->Load();
- gdcm::FileHelper *tested = gdcm::FileHelper::New( f );
+ GDCM_NAME_SPACE::FileHelper *tested = GDCM_NAME_SPACE::FileHelper::New( f );
std::string PixelType = tested->GetFile()->GetPixelType();
int xsize = f->GetXSize();
int ysize = f->GetYSize();
// Step 1 : Create the header of the image
- gdcm::File *fileToBuild = gdcm::File::New();
+ GDCM_NAME_SPACE::File *fileToBuild = GDCM_NAME_SPACE::File::New();
std::ostringstream str;
// Set the image size
* samplesPerPixel /* * img.componentSize / 8*/;
uint8_t *imageData = new uint8_t[size];
- gdcm::FileHelper *fileH = gdcm::FileHelper::New(fileToBuild);
+ GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New(fileToBuild);
//fileH->SetImageData(imageData,size);
assert( size == testedDataSize );
size = of->str().size();
Program: gdcm
Module: $RCSfile: WriteDicomSimple.cxx,v $
Language: C++
- Date: $Date: 2005/11/07 10:33:47 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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") )
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
std::string fileOut = am->ArgMgrGetString("fileout",(char *)"WriteDicomSimple.dcm");
SIZE_X = am->ArgMgrGetInt("NX", 128);
// ----------- End Arguments Manager ---------
-// Step 1 : Create an empty gdcm::FileHelper for the image
+// Step 1 : Create an empty GDCM_NAME_SPACE::FileHelper for the image
// (it deals with the acces to the pixels)
- gdcm::FileHelper *fileH = gdcm::FileHelper::New();
+ GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New();
-// Get the empty gdcm::File of the image
+// Get the empty GDCM_NAME_SPACE::File of the image
// (it deals with the 'entries' od the image header)
- gdcm::File *header = fileH->GetFile();
+ GDCM_NAME_SPACE::File *header = fileH->GetFile();
std::ostringstream str;
Program: gdcm
Module: $RCSfile: WriteRead.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:27 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
std::string fileNameToWrite;
- gdcm::File *e1;
- gdcm::File *e2;
- gdcm::FileHelper *f1;
- gdcm::FileHelper *f2;
+ GDCM_NAME_SPACE::File *e1;
+ GDCM_NAME_SPACE::File *e2;
+ GDCM_NAME_SPACE::FileHelper *f1;
+ GDCM_NAME_SPACE::FileHelper *f2;
uint8_t* imageData, *imageData2;
int dataSize, dataSize2;
// --------------------- we read the input image
std::cout << argv[1] << std::endl;
- e1 = gdcm::File::New( );
+ e1 = GDCM_NAME_SPACE::File::New( );
e1->SetFileName( fileName );
e1->Load();
if (!e1->IsReadable())
return 1;
}
- f1 = gdcm::FileHelper::New(e1);
+ f1 = GDCM_NAME_SPACE::FileHelper::New(e1);
imageData= f1->GetImageData();
dataSize = f1->GetImageDataSize();
f1->WriteDcmExplVR(fileNameToWrite);
// --------------------- we read the written image
- e2 = gdcm::File::New( );
+ e2 = GDCM_NAME_SPACE::File::New( );
e2->SetFileName( fileNameToWrite );
e2->Load();
if (!e2->IsReadable())
f1->Delete();
return 1;
}
- f2 = gdcm::FileHelper::New(e2);
+ f2 = GDCM_NAME_SPACE::FileHelper::New(e2);
imageData2= f2->GetImageData();
dataSize2 = f2->GetImageDataSize();
Program: gdcm
Module: $RCSfile: exCTPET.cxx,v $
Language: C++
- Date: $Date: 2006/01/02 22:02:50 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// No -> Return
// Yes: We found a match
- gdcm::File *fileRef = gdcm::File::New();
+ GDCM_NAME_SPACE::File *fileRef = GDCM_NAME_SPACE::File::New();
fileRef->SetFileName( reference );
- fileRef->SetLoadMode(gdcm::LD_NOSHADOW | gdcm::LD_NOSEQ);
+ fileRef->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOW | GDCM_NAME_SPACE::LD_NOSEQ);
fileRef->Load();
// 0008 0060 CS 1 Modality
std::string modalityRef = fileRef->GetEntryString(0x0008,0x0060);
- if( modalityRef == gdcm::GDCM_UNFOUND ) return 1;
- if ( !gdcm::Util::DicomStringEqual(modalityRef, "CT") ) return 1;
+ if( modalityRef == GDCM_NAME_SPACE::GDCM_UNFOUND ) return 1;
+ if ( !GDCM_NAME_SPACE::Util::DicomStringEqual(modalityRef, "CT") ) return 1;
// 0020 000d UI 1 Study Instance UID
// 0020 000e UI REL Series Instance UID
std::string series_uid_ref = fileRef->GetEntryString(0x0020, 0x000e);
// 0020 0052 UI 1 Frame of Reference UID
std::string frame_uid_ref = fileRef->GetEntryString(0x0020, 0x0052);
// 0020 0032 DS 3 Image Position (Patient)
- gdcm::DataEntry *imagePosRef = fileRef->GetDataEntry(0x0020,0x0032);
+ GDCM_NAME_SPACE::DataEntry *imagePosRef = fileRef->GetDataEntry(0x0020,0x0032);
assert( imagePosRef->GetValueCount() == 3 );
- gdcm::DirList dirList( directory, true );
- const gdcm::DirListType filenames = dirList.GetFilenames();
- gdcm::DirListType::const_iterator it = filenames.begin();
- gdcm::File *file = gdcm::File::New();
- file->SetLoadMode(gdcm::LD_NOSHADOW | gdcm::LD_NOSEQ);
+ GDCM_NAME_SPACE::DirList dirList( directory, true );
+ const GDCM_NAME_SPACE::DirListType filenames = dirList.GetFilenames();
+ GDCM_NAME_SPACE::DirListType::const_iterator it = filenames.begin();
+ GDCM_NAME_SPACE::File *file = GDCM_NAME_SPACE::File::New();
+ file->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOW | GDCM_NAME_SPACE::LD_NOSEQ);
for( ; it != filenames.end(); ++it)
{
file->SetFileName( *it );
std::string modality = file->GetEntryString(0x0008,0x0060);
// This is a dual modality: modality should be *different*
if( modality == modalityRef ) continue;
- if ( !gdcm::Util::DicomStringEqual(modality, "PT") ) continue;
+ if ( !GDCM_NAME_SPACE::Util::DicomStringEqual(modality, "PT") ) continue;
std::string series_uid = file->GetEntryString(0x0020, 0x000e);
// Not same series !
if( series_uid == series_uid_ref ) continue;
std::string frame_uid = file->GetEntryString(0x0020, 0x0052);
if( frame_uid_ref != frame_uid ) continue;
- gdcm::DataEntry *imagePos = file->GetDataEntry(0x0020,0x0032);
+ GDCM_NAME_SPACE::DataEntry *imagePos = file->GetDataEntry(0x0020,0x0032);
assert( imagePos->GetValueCount() == 3 );
if( imagePos->GetValue(0) == imagePosRef->GetValue(0)
&& imagePos->GetValue(1) == imagePosRef->GetValue(1)
Program: gdcm
Module: $RCSfile: exColorToRGB.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:27 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ============================================================
// Read the input image.
// ============================================================
- // a gdcm::File contains all the Dicom Field but the Pixels Element
+ // a GDCM_NAME_SPACE::File contains all the Dicom Field but the Pixels Element
std::cout << argv[1] << std::endl;
- gdcm::File *f = gdcm::File::New();
- f->SetLoadMode( gdcm::LD_ALL);
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
f->SetFileName( fileName );
bool res = f->Load();
// Load the pixels in memory.
// ============================================================
- // We need a gdcm::FileHelper, since we want to load the pixels
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ // We need a GDCM_NAME_SPACE::FileHelper, since we want to load the pixels
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
// uint8_t DOESN'T mean it's mandatory for the image to be a 8 bits one !
// It's just for prototyping.
// ------ without Sequences -------------
- gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
copy->SetFileName( output );
copy->Load();
- gdcm::DocEntry *d = f->GetFirstEntry();
+ GDCM_NAME_SPACE::DocEntry *d = f->GetFirstEntry();
while(d)
{
// We skip SeqEntries, since user cannot do much with them
- if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+ if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
// We skip Shadow Groups, since nobody knows what they mean
&& !( d->GetGroup()%2 ) )
{
- if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
{
copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
de->GetGroup(),de->GetElement(),
}
else
{
- // We skip gdcm::SeqEntries
+ // We skip GDCM_NAME_SPACE::SeqEntries
}
}
d = f->GetNextEntry();
Program: gdcm
Module: $RCSfile: exCurveData.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:27 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* V 5004|0020 [CS] [Type of Data] [PHYSIO]
* V 5004|0022 [LO] [Curve Description] []
* V 5004|0103 [US] [Data Value Representation] [0] x(0)
- * B 5004|3000 [OW] [Curve Data] [gdcm::Binary data loaded;length = 1938]
+ * B 5004|3000 [OW] [Curve Data] [GDCM_NAME_SPACE::Binary data loaded;length = 1938]
*/
int main(int argc, char *argv[])
{
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
std::cout << "------------------------------------------------" << std::endl;
std::cout << "Gets the 'Curve Data' from a full gdcm-readable DICOM " << std::endl;
// Read the input image.
// ============================================================
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
- f->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
+ f->SetLoadMode(GDCM_NAME_SPACE::LD_NOSEQ | GDCM_NAME_SPACE::LD_NOSHADOW);
f->SetFileName( fileName );
bool res = f->Load();
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
{
std::cout << "---------------------------------------------" << std::endl;
f->Print();
// Check whether image contains Overlays ACR-NEMA style.
// ============================================================
- //* B 5004|3000 [OW] [Curve Data] [gdcm::Binary data loaded;length = 1938]
+ //* B 5004|3000 [OW] [Curve Data] [GDCM_NAME_SPACE::Binary data loaded;length = 1938]
std::string curve_data_str = f->GetEntryString(0x5004, 0x3000);
- if (curve_data_str == gdcm::GDCM_UNFOUND)
+ if (curve_data_str == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
std::cout << " Image doesn't contain any Curve Data" << std::endl;
f->Delete();
convert >> data_rep;
- gdcm::DocEntry *pCurveDataDoc = f->GetDocEntry(0x5004, 0x3000);
- gdcm::DataEntry *pCurveData = dynamic_cast<gdcm::DataEntry *>(pCurveDataDoc);
+ GDCM_NAME_SPACE::DocEntry *pCurveDataDoc = f->GetDocEntry(0x5004, 0x3000);
+ GDCM_NAME_SPACE::DataEntry *pCurveData = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(pCurveDataDoc);
uint8_t *curve_data = pCurveData->GetBinArea();
// From Part3, C.10.2.1.2 Data value representation (p668)
Program: gdcm
Module: $RCSfile: exExtractDicomTags.cxx,v $
Language: C++
- Date: $Date: 2005/11/09 08:34:29 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage"))
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
// if unused Params we give up
if ( am->ArgMgrPrintUnusedLabels() )
int loadMode = 0x0; // load everything
- gdcm::File *f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode( loadMode );
f->SetFileName( fileName );
bool res = f->Load();
Program: gdcm
Module: $RCSfile: exExtractTag.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:27 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int main(int argc, char *argv[])
{
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
if( argc < 5 )
{
// Read the input image.
// ============================================================
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
- //f->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
+ //f->SetLoadMode(GDCM_NAME_SPACE::LD_NOSEQ | GDCM_NAME_SPACE::LD_NOSHADOW);
f->SetFileName( fileName );
bool res = f->Load();
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
{
std::cout << "---------------------------------------------" << std::endl;
f->Print();
std::cout << "Extracting tag: (0x" << std::hex << std::setw(4) << std::setfill('0')
<< group << ",0x" << std::setw(4) << std::setfill('0') << elem << ")" << std::endl;
std::string dicom_tag_value = f->GetEntryString(group, elem);
- if (dicom_tag_value == gdcm::GDCM_UNFOUND)
+ if (dicom_tag_value == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
- gdcm::DictEntry *dictEntry = f->GetPubDict()->GetEntry( group, elem);
+ GDCM_NAME_SPACE::DictEntry *dictEntry = f->GetPubDict()->GetEntry( group, elem);
std::cerr << "Image doesn't contain any tag: " << dictEntry->GetName() << std::endl;
f->Delete();
return 1;
}
- gdcm::DocEntry *dicom_tag_doc = f->GetDocEntry(group, elem);
- gdcm::DataEntry *dicom_tag = dynamic_cast<gdcm::DataEntry *>(dicom_tag_doc);
+ GDCM_NAME_SPACE::DocEntry *dicom_tag_doc = f->GetDocEntry(group, elem);
+ GDCM_NAME_SPACE::DataEntry *dicom_tag = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(dicom_tag_doc);
if( !dicom_tag )
{
std::cerr << "Sorry DataEntry only please" << std::endl;
Program: gdcm
Module: $RCSfile: exGC.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:27 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ============================================================
// Read the input image.
// ============================================================
- // a gdcm::File contains all the Dicom Field but the Pixels Element
+ // a GDCM_NAME_SPACE::File contains all the Dicom Field but the Pixels Element
std::cout << argv[1] << std::endl;
- gdcm::File *f = gdcm::File::New();
- f->SetLoadMode( gdcm::LD_ALL);
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
f->SetFileName( fileName );
bool res = f->Load();
// Load the pixels in memory.
// ============================================================
- // We need a gdcm::FileHelper, since we want to load the pixels
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ // We need a GDCM_NAME_SPACE::FileHelper, since we want to load the pixels
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
// (unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one)
// ------ without Sequences -------------
- gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
copy->SetFileName( output );
copy->Load();
- gdcm::DocEntry *d = f->GetFirstEntry();
+ GDCM_NAME_SPACE::DocEntry *d = f->GetFirstEntry();
while(d)
{
// We skip SeqEntries, since user cannot do much with them
- if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+ if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
// We skip Shadow Groups, since nobody knows what they mean
&& !( d->GetGroup()%2 ) )
{
- if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
{
copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
de->GetGroup(),de->GetElement(),
}
else
{
- // We skip gdcm::SeqEntries
+ // We skip GDCM_NAME_SPACE::SeqEntries
}
}
d = f->GetNextEntry();
Program: gdcm
Module: $RCSfile: exGrey2RGB.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:28 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return 1;
}
- //gdcm::Debug::DebugOn();
+ //GDCM_NAME_SPACE::Debug::DebugOn();
std::string filename = argv[1];
std::string output = argv[2];
}
}
- gdcm::FileHelper *fh = gdcm::FileHelper::New( );
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New( );
fh->SetFileName( filename );
fh->Load();
Program: gdcm
Module: $RCSfile: exImageLighten.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:28 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::cout << argv[1] << std::endl;
- gdcm::File *f = gdcm::File::New();
- f->SetLoadMode( gdcm::LD_ALL);
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
f->SetFileName( fileName );
bool res = f->Load();
// Pixel Reading must be done here, to be sure
// to load the Palettes Color (if any)
- // First, create a gdcm::FileHelper
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+ // First, create a GDCM_NAME_SPACE::FileHelper
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
// Load the pixels, DO NOT transform LUT (if any) into RGB Pixels
uint8_t *imageDataRaw = fh->GetImageDataRaw();
size_t dataRawSize = fh->GetImageDataRawSize();
// ============================================================
-// Create a new gdcm::Filehelper, to hold new image.
+// Create a new GDCM_NAME_SPACE::Filehelper, to hold new image.
// ============================================================
- gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
copy->SetFileName( output );
copy->Load();
// Selective copy of the entries (including Pixel Element).
// ============================================================
- gdcm::DocEntry *d = f->GetFirstEntry();
+ GDCM_NAME_SPACE::DocEntry *d = f->GetFirstEntry();
while(d)
{
// We skip SeqEntries, since user cannot do much with them
- if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+ if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
// We skip Shadow Groups, since nobody knows what they mean
&& !( d->GetGroup()%2 ) )
{
- if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
{
copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
de->GetGroup(),de->GetElement(),
}
else
{
- // We skip gdcm::SeqEntries
+ // We skip GDCM_NAME_SPACE::SeqEntries
}
}
d = f->GetNextEntry();
Program: gdcm
Module: $RCSfile: exMoveImagesToSingleSerieUID.cxx,v $
Language: C++
- Date: $Date: 2007/03/27 11:38:02 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage") || argc == 1)
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
int verbose = am->ArgMgrDefined("verbose");
std::string patName = am->ArgMgrGetString("patname", "g^PatientName");
int userDefinedSerie = am->ArgMgrDefined("serieUID");
const char *serieUID = am->ArgMgrGetString("serieUID");
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
/* if unused Param we give up */
//std::cout << "dirIn [" << dirIn << "]" << std::endl;
- if ( ! gdcm::DirList::IsDirectory(dirIn) )
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirIn) )
{
std::cout << "KO : [" << dirIn << "] is not a Directory." << std::endl;
return 0;
std::string strDirNameout(dirOut); // to please gcc 4
std::cout << "Check for output directory :[" << dirOut << "]."
<<std::endl;
- if ( ! gdcm::DirList::IsDirectory(dirOut) ) // dirout not found
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirOut) ) // dirout not found
{
systemCommand = "mkdir " +strDirNameout; // create it!
if (verbose)
std::cout << systemCommand << std::endl;
system (systemCommand.c_str());
- if ( ! gdcm::DirList::IsDirectory(dirOut) ) // be sure it worked
+ if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirOut) ) // be sure it worked
{
std::cout << "KO : not a dir : [" << dirOut << "] (creation failure ?)" << std::endl;
return 0;
std::cout << "Output Directory [" << dirOut << "] already exists; Used as is." << std::endl;
}
- gdcm::DirList dirList(dirIn,false); // gets (at single level) the file list
- gdcm::DirListType fileList = dirList.GetFilenames();
+ GDCM_NAME_SPACE::DirList dirList(dirIn,false); // gets (at single level) the file list
+ GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames();
// 'Study Instance UID'
// The user is allowed to create his own Study,
// adding new Series to an already existing Study
std::string strStudyUID;
if ( !userDefinedStudy)
- strStudyUID = gdcm::Util::CreateUniqueUID();
+ strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
else
strStudyUID = studyUID;
std::string strSerieUID;
if ( !userDefinedSerie)
- strSerieUID = gdcm::Util::CreateUniqueUID();
+ strSerieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
else
strSerieUID = serieUID;
- gdcm::File *f;
- gdcm::FileHelper *fh;
+ GDCM_NAME_SPACE::File *f;
+ GDCM_NAME_SPACE::FileHelper *fh;
std::string fullFilename, lastFilename;
float zPositionComponent = 0.0;
- for( gdcm::DirListType::iterator it = fileList.begin();
+ for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
fullFilename = *it;
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( it->c_str() );
// Load the pixels in RAM.
- fh = gdcm::FileHelper::New(f);
+ fh = GDCM_NAME_SPACE::FileHelper::New(f);
uint8_t *imageData = fh->GetImageDataRaw(); // Don't convert (Gray Pixels + LUT) into (RGB pixels) ?!?
if (!imageData)
std::cout << "fail to read [" << it->c_str() << std::endl;
// ==================================================================================================
- fh->SetContentType(gdcm::UNMODIFIED_PIXELS_IMAGE);
+ fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
- lastFilename = gdcm::Util::GetName( fullFilename );
- std::string fullWriteFilename = strDirNameout + gdcm::GDCM_FILESEPARATOR
+ lastFilename = GDCM_NAME_SPACE::Util::GetName( fullFilename );
+ std::string fullWriteFilename = strDirNameout + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ lastFilename;
if (verbose)
std::cout << "Write : [" << fullWriteFilename << "]" << std::endl;
Program: gdcm
Module: $RCSfile: exOverlaysACR.cxx,v $
Language: C++
- Date: $Date: 2006/06/30 09:52:53 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int main(int argc, char *argv[])
{
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
- //gdcm::Debug::DebugOn();
+ //GDCM_NAME_SPACE::Debug::DebugOn();
std::cout << "------------------------------------------------" << std::endl;
std::cout << "Gets the 'Overlays' from a full gdcm-readable ACR-NEMA "
//std::cout << argv[1] << std::endl;
- f = gdcm::File::New( );
+ f = GDCM_NAME_SPACE::File::New( );
- f->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
+ f->SetLoadMode(GDCM_NAME_SPACE::LD_NOSEQ | GDCM_NAME_SPACE::LD_NOSHADOW);
f->SetFileName( fileName );
bool res = f->Load();
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
{
std::cout << "---------------------------------------------" << std::endl;
f->Print();
return 0;
}
std::string s1 = f->GetEntryString(0x6000, 0x0102);
- if (s1 == gdcm::GDCM_UNFOUND)
+ if (s1 == GDCM_NAME_SPACE::GDCM_UNFOUND)
{
std::cout << " Image doesn't contain any Overlay " << std::endl;
f->Delete();
// Load the pixels in memory.
// ============================================================
- // We don't use a gdcm::FileHelper, since it rubs out
+ // We don't use a GDCM_NAME_SPACE::FileHelper, since it rubs out
// the 'non image' bits of the pixels...
/// \todo : Previous remark doesn't work if pixels are compressed !
std::cout << "Dimensions " << ny << " " <<ny << std::endl;
- gdcm::DocEntry *p = f->GetDocEntry(f->GetGrPixel(), f->GetNumPixel());
+ GDCM_NAME_SPACE::DocEntry *p = f->GetDocEntry(f->GetGrPixel(), f->GetNumPixel());
if (p == 0)
std::cout << "Pixels element not found" << std::endl;
else
uint16_t overlayLocation;
std::ostringstream str;
std::string strOverlayLocation;
- gdcm::File *fileToBuild = 0;
- gdcm::FileHelper *fh = 0;
+ GDCM_NAME_SPACE::File *fileToBuild = 0;
+ GDCM_NAME_SPACE::FileHelper *fh = 0;
while ( (strOvlBitPosition = f->GetEntryString(currentOvlGroup, 0x0102))
- != gdcm::GDCM_UNFOUND )
+ != GDCM_NAME_SPACE::GDCM_UNFOUND )
{
strOverlayLocation = f->GetEntryString(currentOvlGroup, 0x0200);
- if ( strOverlayLocation != gdcm::GDCM_UNFOUND )
+ if ( strOverlayLocation != GDCM_NAME_SPACE::GDCM_UNFOUND )
{
overlayLocation = atoi(strOverlayLocation.c_str());
if ( overlayLocation != f->GetGrPixel() )
std::cout << "Mask :[" <<std::hex << mask << "]" << std::endl;
for (int j=0; j<nx*ny ; j++)
{
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
if (pixels[j] >= 0x1000)// if it contains at least one overlay bit
printf("%d : %04x\n",j, pixels[j]);
else
tabPixels[j] = 128;
}
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "About to built empty file" << std::endl;
- fileToBuild = gdcm::File::New();
+ fileToBuild = GDCM_NAME_SPACE::File::New();
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "Finish to built empty file" << std::endl;
str.str("");
// Other mandatory fields will be set automatically,
// just before Write(), by FileHelper::CheckMandatoryElements()
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "-------------About to built FileHelper" << std::endl;
- fh = gdcm::FileHelper::New(fileToBuild);
+ fh = GDCM_NAME_SPACE::FileHelper::New(fileToBuild);
- if( gdcm::Debug::GetDebugFlag() )
+ if( GDCM_NAME_SPACE::Debug::GetDebugFlag() )
std::cout << "-------------Finish to built FileHelper" << std::endl;
fh->SetImageData(tabPixels,nx*ny);
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 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();
// if unused Param we give up
if ( am->ArgMgrPrintUnusedLabels() )
// Read the input file.
// ============================================================
- gdcm::File *f;
+ GDCM_NAME_SPACE::File *f;
- f = gdcm::File::New( );
- f->SetLoadMode( gdcm::LD_ALL );
+ f = GDCM_NAME_SPACE::File::New( );
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL );
f->SetFileName( fileName );
f->AddForceLoadElement(0x6000,0x3000); // Overlay Data
int res = f->Load();
// Load the Overlays in memory (the first one)
// ============================================================
- gdcm::DataEntry *e = f->GetDataEntry(0x6000, 0x3000);
+ GDCM_NAME_SPACE::DataEntry *e = f->GetDataEntry(0x6000, 0x3000);
if (e == 0)
{
std::cout << " Image doesn't contain any Overlay " << std::endl;
// ============================================================
// Write a new file
// ============================================================
- gdcm::File *f2;
- f2 = gdcm::File::New( );
+ GDCM_NAME_SPACE::File *f2;
+ f2 = GDCM_NAME_SPACE::File::New( );
char temp[256];
// feel free to add any field (Dicom Data Entry) you like, here.
// ...
- gdcm::FileHelper *fh = gdcm::FileHelper::New(f2);
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f2);
fh->SetImageData(outputData,dimXY);
fh->WriteDcmExplVR(outputFileName);
Program: gdcm
Module: $RCSfile: exReadPapyrus.cxx,v $
Language: C++
- Date: $Date: 2006/08/29 14:39:45 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
}
// ----------------------------------------------------------------------
-// Here we load a supposed to be Papyrus File (gdcm::File compliant)
+// Here we load a supposed to be Papyrus File (GDCM_NAME_SPACE::File compliant)
// and then try to get the pixels, using low-level SeqEntry accessors.
// Since it's not a general purpose Papyrus related program
// (just a light example) we suppose *everything* is clean
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage"))
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
// if unused Params we give up
if ( am->ArgMgrPrintUnusedLabels() )
}
int loadMode = 0x0; // load everything
- gdcm::File *f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
f->SetLoadMode( loadMode );
f->SetFileName( fileName );
bool res = f->Load();
}
// Look for private Papyrus Sequence
- gdcm::SeqEntry *seqPapyrus= f->GetSeqEntry(0x0041, 0x1050);
+ GDCM_NAME_SPACE::SeqEntry *seqPapyrus= f->GetSeqEntry(0x0041, 0x1050);
if (!seqPapyrus)
{
std::cout << "NOT a Papyrus File : " << fileName <<std::endl;
return 1;
}
-// gdcm::FileHelper *original = new gdcm::FileHelper( fileName );
-// gdcm::File *h = original->GetFile();
+// GDCM_NAME_SPACE::FileHelper *original = new GDCM_NAME_SPACE::FileHelper( fileName );
+// GDCM_NAME_SPACE::File *h = original->GetFile();
- //gdcm::FileHelper *f1 = new gdcm::FileHelper(f);
- gdcm::SQItem *sqi = seqPapyrus->GetFirstSQItem();
+ //GDCM_NAME_SPACE::FileHelper *f1 = new GDCM_NAME_SPACE::FileHelper(f);
+ GDCM_NAME_SPACE::SQItem *sqi = seqPapyrus->GetFirstSQItem();
if (sqi == 0)
{
std::cout << "NO SQItem found within private Papyrus Sequence"
// allocate enough room to get the pixels of all images.
uint8_t *PixelArea = new uint8_t[lgrImage*nbImages];
uint8_t *currentPosition = PixelArea;
- gdcm::DataEntry *pixels;
+ GDCM_NAME_SPACE::DataEntry *pixels;
// declare and open the file
std::ifstream *Fp;
// build up a new File, with file info + images info + global pixel area.
- std::string NumberOfFrames = gdcm::Util::Format("%d", nbImages);
+ std::string NumberOfFrames = GDCM_NAME_SPACE::Util::Format("%d", nbImages);
- gdcm::File *n = gdcm::File::New();
+ GDCM_NAME_SPACE::File *n = GDCM_NAME_SPACE::File::New();
n->InsertEntryString(MediaStSOPinstUID, 0x0002,0x0002);
// Whe keep default gdcm Transfer Syntax (Explicit VR Little Endian)
n->InsertEntryString(PixelRepresentation,0x0028,0x0103);
// create the file
- gdcm::FileHelper *file = gdcm::FileHelper::New(n);
+ GDCM_NAME_SPACE::FileHelper *file = GDCM_NAME_SPACE::FileHelper::New(n);
file->SetImageData(PixelArea,lgrImage*nbImages);
file->SetWriteTypeToDcmExplVR();
Program: gdcm
Module: $RCSfile: exReadWriteFile.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:28 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::string filename = argv[1];
std::string output = argv[2];
- // First, let's create a gdcm::File
+ // First, let's create a GDCM_NAME_SPACE::File
// that will contain all the Dicom fields but the Pixels Element
- gdcm::File *f1= gdcm::File::New( );
+ GDCM_NAME_SPACE::File *f1= GDCM_NAME_SPACE::File::New( );
f1->SetFileName( filename );
f1->Load();
<< "--- Display only human readable values -----------------------"
<< std::endl;
- gdcm::DataEntry *dataEntry;
+ GDCM_NAME_SPACE::DataEntry *dataEntry;
std::string value;
- gdcm::VRKey vr; // value representation
+ GDCM_NAME_SPACE::VRKey vr; // value representation
std::string vm; // value multiplicity
std::string name; // held in the Dicom Dictionary
- gdcm::DocEntry *d = f1->GetFirstEntry();
+ GDCM_NAME_SPACE::DocEntry *d = f1->GetFirstEntry();
while( d )
{
// We skip SeqEntries, since user cannot do much with them
- if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+ if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
// We skip Shadow Groups, since nobody knows what they mean
&& !( d->GetGroup()%2 ) )
{
// If user wants to get info about the entry
// (he is sure, here that DocEntry is a DataEntry)
- dataEntry = dynamic_cast<gdcm::DataEntry *>(d);
+ dataEntry = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d);
// Let's be carefull -maybe he commented out some previous line-
if (!dataEntry)
continue;
// Hope now he knows enought about the image ;-)
- // First, create a gdcm::FileHelper
- gdcm::FileHelper *fh1 = gdcm::FileHelper::New(f1);
+ // First, create a GDCM_NAME_SPACE::FileHelper
+ GDCM_NAME_SPACE::FileHelper *fh1 = GDCM_NAME_SPACE::FileHelper::New(f1);
// Load the pixels, transforms LUT (if any) into RGB Pixels
uint8_t *imageData = fh1->GetImageData();
// ------ User wants write a new image without shadow groups -------------
- gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
copy->SetFileName( output );
copy->Load();
while(d)
{
// We skip SeqEntries, since user cannot do much with them
- if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+ if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
// We skip Shadow Groups, since nobody knows what they mean
&& !( d->GetGroup()%2 ) )
{
- if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
{
copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
de->GetGroup(),de->GetElement(),
}
else
{
- // We skip gdcm::SeqEntries
+ // We skip GDCM_NAME_SPACE::SeqEntries
}
}
d = f1->GetNextEntry();
Program: gdcm
Module: $RCSfile: exSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2005/11/14 15:55:17 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int main(int argc, char *argv[])
{
- gdcm::SerieHelper *s;
+ GDCM_NAME_SPACE::SerieHelper *s;
std::string dirName;
if (argc > 1)
}
if (argc > 2)
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
std::cout << "Dir Name :[" << dirName << "]" << std::endl;
- s = gdcm::SerieHelper::New();
- s->SetLoadMode(gdcm::LD_ALL); // Load everything for each File
- //gdcm::TagKey t(0x0020,0x0013);
- //s->AddRestriction(t, "340", gdcm::GDCM_LESS); // Keep only files where
+ s = GDCM_NAME_SPACE::SerieHelper::New();
+ s->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); // Load everything for each File
+ //GDCM_NAME_SPACE::TagKey t(0x0020,0x0013);
+ //s->AddRestriction(t, "340", GDCM_NAME_SPACE::GDCM_LESS); // Keep only files where
// restriction is true
s->SetDirectory(dirName, true); // true : recursive exploration
<< std::endl;
int nbFiles;
- // For all the Single SerieUID Files Sets of the gdcm::Serie
- gdcm::FileList *l = s->GetFirstSingleSerieUIDFileSet();
+ // For all the Single SerieUID Files Sets of the GDCM_NAME_SPACE::Serie
+ GDCM_NAME_SPACE::FileList *l = s->GetFirstSingleSerieUIDFileSet();
while (l)
{
nbFiles = l->size() ;
std::string fileName;
l = s->GetFirstSingleSerieUIDFileSet();
- for (std::vector<gdcm::File* >::iterator it = l->begin();
+ for (std::vector<GDCM_NAME_SPACE::File* >::iterator it = l->begin();
it != l->end();
++it)
{
Program: gdcm
Module: $RCSfile: exXCoherentFileSet.cxx,v $
Language: C++
- Date: $Date: 2006/07/26 17:05:25 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage") || argc == 1)
{
}
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
- 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;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= gdcm::LD_NOSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
const char *dirName = am->ArgMgrGetString("dirin");
delete am; // ------ we don't need Arguments Manager any longer ------
- gdcm::SerieHelper *s;
+ GDCM_NAME_SPACE::SerieHelper *s;
- s = gdcm::SerieHelper::New();
- s->SetLoadMode(gdcm::LD_ALL); // Load everything for each File
- //gdcm::TagKey t(0x0020,0x0013);
- //s->AddRestriction(t, "340", gdcm::GDCM_LESS); // Keep only files where
+ s = GDCM_NAME_SPACE::SerieHelper::New();
+ s->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); // Load everything for each File
+ //GDCM_NAME_SPACE::TagKey t(0x0020,0x0013);
+ //s->AddRestriction(t, "340", GDCM_NAME_SPACE::GDCM_LESS); // Keep only files where
// restriction is true
s->SetDirectory(dirName, true); // true : recursive exploration
+ // The Dicom file set is splitted into several 'Single SerieUID Files Sets'
+ // (a 'Single SerieUID Files Set' per SerieUID)
+ // In some cases, it's not enough, since, in some cases
+ // we can find scout view with the same SerieUID
+
/*
std::cout << " ---------------------------------------- "
<< "'Single UID' Filesets found in :["
*/
int nbFiles;
std::string fileName;
- // For all the Single SerieUID Files Sets of the gdcm::Serie
- gdcm::FileList *l = s->GetFirstSingleSerieUIDFileSet();
+ // For all the Single SerieUID Files Sets of the GDCM_NAME_SPACE::Serie
+ GDCM_NAME_SPACE::FileList *l = s->GetFirstSingleSerieUIDFileSet();
- gdcm::XCoherentFileSetmap xcm;
- while (l)
+ GDCM_NAME_SPACE::XCoherentFileSetmap xcm;
+ while (l) // for each 'Single SerieUID FileSet'
{
nbFiles = l->size() ;
if ( l->size() > 3 ) // Why not ? Just an example, for testing
if (groupelem != 0)
xcm = s->SplitOnTagValue(l, groupelem[0],groupelem[1] );
- for (gdcm::XCoherentFileSetmap::iterator i = xcm.begin();
+ for (GDCM_NAME_SPACE::XCoherentFileSetmap::iterator i = xcm.begin();
i != xcm.end();
++i)
{
//s->OrderFileList((*i).second); // sort the XCoherent Fileset
- for (gdcm::FileList::iterator it = ((*i).second)->begin();
+ for (GDCM_NAME_SPACE::FileList::iterator it = ((*i).second)->begin();
it != ((*i).second)->end();
++it)
{
- Binary distribution:
cd $GDCMHOME
make clean
- [ or you migth get some complains about the function
+ [ or you might get some complains about the function
PyVTKClass_vtkGdcmReaderNew being multiply defined: this is
because of the loose definition of vtkSources in setup.py
in which the usage of the glob function will produce a link
Program: gdcm
Module: $RCSfile: TestBug.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:03:00 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int TestBug(int argc, char *argv[])
{
std::cout << "==========test" <<std::endl;
- gdcm::File *f;
- f = gdcm::File::New();
+ GDCM_NAME_SPACE::File *f;
+ f = GDCM_NAME_SPACE::File::New();
if (argc > 1)
f->SetFileName( argv[1] );
Program: gdcm
Module: $RCSfile: TestCommand.cxx,v $
Language: C++
- Date: $Date: 2005/11/30 08:48:15 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <typeinfo>
-class CommandTest : public gdcm::Command
+class CommandTest : public GDCM_NAME_SPACE::Command
{
gdcmTypeMacro(CommandTest);
gdcmNewMacro(CommandTest);
};
static bool fctExecuted = false;
-void CallbackTest(gdcm::CallbackCommand *cmd)
+void CallbackTest(GDCM_NAME_SPACE::CallbackCommand *cmd)
{
std::cout << "Test class command... for "
<< typeid(cmd->GetObject()).name()
{
int error=0;
- gdcm::CallbackCommand *cbk = gdcm::CallbackCommand::New();
+ GDCM_NAME_SPACE::CallbackCommand *cbk = GDCM_NAME_SPACE::CallbackCommand::New();
cbk->SetCallback(CallbackTest);
- gdcm::CommandManager::SetCommand(NULL,1,cbk);
+ GDCM_NAME_SPACE::CommandManager::SetCommand(NULL,1,cbk);
cbk->Delete();
CommandTest *cmd = CommandTest::New();
- gdcm::CommandManager::SetCommand(NULL,2,cmd);
+ GDCM_NAME_SPACE::CommandManager::SetCommand(NULL,2,cmd);
cmd->Delete();
std::cout << "Test on callback function execution\n";
- gdcm::CommandManager::ExecuteCommand(NULL,1,"Test on callback function");
+ GDCM_NAME_SPACE::CommandManager::ExecuteCommand(NULL,1,"Test on callback function");
if(!fctExecuted)
std::cout<<"... Failed\n";
error+=!fctExecuted;
std::cout << std::endl;
std::cout << "Test on command class execution\n";
- gdcm::CommandManager::ExecuteCommand(NULL,2,"Test on command class");
+ GDCM_NAME_SPACE::CommandManager::ExecuteCommand(NULL,2,"Test on command class");
if(!cmd->IsExecuted())
std::cout<<"... Failed\n";
error+=!cmd->IsExecuted();
std::cout << std::endl;
std::cout << "Test on unset command execution\n";
- gdcm::CommandManager::ExecuteCommand(NULL,3,"Test on callback function");
+ GDCM_NAME_SPACE::CommandManager::ExecuteCommand(NULL,3,"Test on callback function");
std::cout << std::endl;
return error;
Program: gdcm
Module: $RCSfile: TestDicomDirElement.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:30 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int TestDicomDirElement(int , char *[])
{
- gdcm::DicomDirElement *ddElt = gdcm::DicomDirElement::New();
+ GDCM_NAME_SPACE::DicomDirElement *ddElt = GDCM_NAME_SPACE::DicomDirElement::New();
if (ddElt == 0)
{
std::cout << "new DicomDirElement failed" << std::endl;
Program: gdcm
Module: $RCSfile: TestDict.cxx,v $
Language: C++
- Date: $Date: 2005/11/29 17:08:54 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::cout << "----- Test Default Dicom Dictionary : ----------" << std::endl;
// Just to improve test coverage:
- gdcm::Dict *tempDict = gdcm::Dict::New("dummyFileNameThatDoesntExist");
+ GDCM_NAME_SPACE::Dict *tempDict = GDCM_NAME_SPACE::Dict::New("dummyFileNameThatDoesntExist");
// Default dict is supposed to be used.
tempDict->Print();
std::cout << "---- end Test Default Dicom Dictionary : -------" << std::endl;
// Print the DictSet
std::cout<<"#######################################################\n";
- gdcm::DictSet *dicts=gdcm::Global::GetDicts();
+ GDCM_NAME_SPACE::DictSet *dicts=GDCM_NAME_SPACE::Global::GetDicts();
if(!dicts)
{
std::cout<<"DictSet hasn't be found... Failed\n";
std::cout<<"DictSet content :\n";
- gdcm::Dict *d = dicts->GetFirstDict();
+ GDCM_NAME_SPACE::Dict *d = dicts->GetFirstDict();
if (!d)
{
std::cout << "Dictset is empty" << std::endl;
// Print the Dict (public)
std::cout<<"#######################################################\n";
- gdcm::Dict *pubDict=dicts->GetDefaultPubDict();
+ GDCM_NAME_SPACE::Dict *pubDict=dicts->GetDefaultPubDict();
if(!pubDict)
{
std::cout<<"The public Dict hasn't be found... Failed\n";
std::cout<<"#######################################################\n";
const int ENTRY_GR = 0x10;
const int ENTRY_EL = 0x20;
- gdcm::TagKey key = gdcm::DictEntry::TranslateToKey(ENTRY_GR,ENTRY_EL);
- gdcm::DictEntry *entry=pubDict->GetEntry(ENTRY_GR,ENTRY_EL);
+ GDCM_NAME_SPACE::TagKey key = GDCM_NAME_SPACE::DictEntry::TranslateToKey(ENTRY_GR,ENTRY_EL);
+ GDCM_NAME_SPACE::DictEntry *entry=pubDict->GetEntry(ENTRY_GR,ENTRY_EL);
if(!entry)
{
std::cout<<"The DictEntry hasn't be found... Failed\n";
Program: gdcm
Module: $RCSfile: TestDictGroupName.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:30 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iomanip>
-int CompareDictGroupName(gdcm::DictGroupName *groupName,
+int CompareDictGroupName(GDCM_NAME_SPACE::DictGroupName *groupName,
uint16_t group,std::string ref)
{
std::string val = groupName->GetName(group);
int TestDictGroupName(int , char *[])
{
- gdcm::DictGroupName *groupName = gdcm::DictGroupName::New();
+ GDCM_NAME_SPACE::DictGroupName *groupName = GDCM_NAME_SPACE::DictGroupName::New();
groupName->Print( std::cout );
int ret = 0;
std::cout << std::endl;
ret += CompareDictGroupName(groupName,0x0002,"Meta Elements");
ret += CompareDictGroupName(groupName,0x7fe0,"Pixels");
- ret += CompareDictGroupName(groupName,0x0007,gdcm::GDCM_UNFOUND);
+ ret += CompareDictGroupName(groupName,0x0007,GDCM_NAME_SPACE::GDCM_UNFOUND);
groupName->Delete();
Program: gdcm
Module: $RCSfile: TestImageSet.cxx,v $
Language: C++
- Date: $Date: 2006/04/11 16:05:03 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <sstream>
#include <list>
-typedef std::list<gdcm::File *> FileList;
+typedef std::list<GDCM_NAME_SPACE::File *> FileList;
// If there is sameSerie, sameStudy is set to true
int CompareImages(FileList &list, bool sameSerie, bool sameStudy)
{
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
if( sameSerie )
sameStudy = true;
- gdcm::DataEntry *entry;
+ GDCM_NAME_SPACE::DataEntry *entry;
std::map<std::string, int> instUID;
std::map<std::string, int> mediaUID;
std::map<std::string, int> serieUID;
list.clear();
}
-gdcm::File *WriteImage(gdcm::File *file, const std::string &fileName)
+GDCM_NAME_SPACE::File *WriteImage(GDCM_NAME_SPACE::File *file, const std::string &fileName)
{
// Create a 256x256x1 image 8 bits, unsigned
std::ostringstream str;
memset(imageData,0,size);
// Write the image
- gdcm::FileHelper *hlp = gdcm::FileHelper::New(file);
+ GDCM_NAME_SPACE::FileHelper *hlp = GDCM_NAME_SPACE::FileHelper::New(file);
hlp->SetImageData(imageData,size);
hlp->SetWriteTypeToDcmExplVR();
if( !hlp->Write(fileName) )
hlp->Delete();
// Read the written image
- gdcm::File *reread = gdcm::File::New( );
+ GDCM_NAME_SPACE::File *reread = GDCM_NAME_SPACE::File::New( );
reread->SetFileName( fileName );
reread->Load();
if( !reread->IsReadable() )
<< " to different Series within the same Study" << std::endl;
std::cout << std::endl << std::endl;
- gdcm::File *file;
- gdcm::File *newFile;
+ GDCM_NAME_SPACE::File *file;
+ GDCM_NAME_SPACE::File *newFile;
FileList fileList;
int i;
{
std::ostringstream fileName;
fileName << "FileSeq" << i << ".dcm";
- file = gdcm::File::New();
+ file = GDCM_NAME_SPACE::File::New();
// It's up to the user to initialize Serie UID and Study UID
// Study Instance UID
- studyUID = gdcm::Util::CreateUniqueUID();
+ studyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
// Series Instance UID
- serieUID = gdcm::Util::CreateUniqueUID();
+ serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");
newFile = WriteImage(file, fileName.str());
// Step 2 : Same Serie & Study
fileList.clear();
- studyUID = gdcm::Util::CreateUniqueUID();
- serieUID = gdcm::Util::CreateUniqueUID();
+ studyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+ serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
for(i = 0;i < 4;i++)
{
std::ostringstream fileName;
fileName << "FileSeq" << i << ".dcm";
- file = gdcm::File::New();
+ file = GDCM_NAME_SPACE::File::New();
file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");
// Step 3 : Same Study
fileList.clear();
- serieUID = gdcm::Util::CreateUniqueUID();
+ serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
for(i = 0;i < 4;i++)
{
std::ostringstream fileName;
fileName << "FileSeq" << i << ".dcm";
- file = gdcm::File::New();
+ file = GDCM_NAME_SPACE::File::New();
file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
- serieUID = gdcm::Util::CreateUniqueUID();
+ serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");
newFile = WriteImage(file, fileName.str());
if( !newFile )
Program: gdcm
Module: $RCSfile: TestTS.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:31 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int TestTS(int , char *[])
{
- gdcm::TS *ts = gdcm::TS::New();
+ GDCM_NAME_SPACE::TS *ts = GDCM_NAME_SPACE::TS::New();
// There should be ~150 entries
ts->Print( std::cout );
std::cout << ts->IsJPEG( "1.2.840.10008.1.2.5") << std::endl;
std::cout << ts->GetSpecialTransferSyntax(
ts->GetSpecialTransferSyntax( "1.2.840.10008.1.2.5")) << std::endl;
- std::cout << gdcm::Global::GetTS()->IsRLELossless( "1.2.840.10008.1.2.5" )
+ std::cout << GDCM_NAME_SPACE::Global::GetTS()->IsRLELossless( "1.2.840.10008.1.2.5" )
<< std::endl;
- bool ret = ts->GetValue( "" ) != gdcm::GDCM_UNFOUND;
+ bool ret = ts->GetValue( "" ) != GDCM_NAME_SPACE::GDCM_UNFOUND;
ts->Delete();
Program: gdcm
Module: $RCSfile: TestUtil.cxx,v $
Language: C++
- Date: $Date: 2006/05/31 16:25:09 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.21 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
float flt;
double dbl=1.0;
- std::cout << "This is gdcm version: " << gdcm::Util::GetVersion() << std::endl;
+ std::cout << "This is gdcm version: " << GDCM_NAME_SPACE::Util::GetVersion() << std::endl;
std::cout << "---------- uint16 : " << std::dec << u16 << " = 0x"
<< std::hex << u16 << std::endl;
// CreateCleanString
std::string x = "a#@-bc\tdef";
- std::string y = gdcm::Util::CreateCleanString(x);
+ std::string y = GDCM_NAME_SPACE::Util::CreateCleanString(x);
std::cout << "Clean : [" << x <<"] --> [" << y <<"]" << std::endl;
x = "abcd#@-wyz*@-lmn#@-uvw-#@ijk";
std::cout << "in [" << x << "] " << std::endl;
std::cout << " - count '#@-' : "
- << gdcm::Util::CountSubstring(x, "#@-") << std::endl;
+ << GDCM_NAME_SPACE::Util::CountSubstring(x, "#@-") << std::endl;
// Tokenize : tokens are '#', '@', '-'
std::vector<std::string> tokens;
std::cout << " - use tokens '#@-' :" << std::endl;
- gdcm::Util::Tokenize (x, tokens, "#@-");
+ GDCM_NAME_SPACE::Util::Tokenize (x, tokens, "#@-");
for (unsigned int ui=0; ui<tokens.size();ui++)
{
std::cout << "[" << tokens[ui] << "]" << std::endl;
tokens.clear();
// Time
- std::cout << "Time:" << gdcm::Util::GetCurrentDateTime() << std::endl;
+ std::cout << "Time:" << GDCM_NAME_SPACE::Util::GetCurrentDateTime() << std::endl;
// Processor ID
unsigned int processorID;;
- processorID = gdcm::Util::GetCurrentProcessID();
+ processorID = GDCM_NAME_SPACE::Util::GetCurrentProcessID();
std::cout << "Current Processor ID " << processorID << std::endl;
// MAC Adress
- std::cout << "Mac Address:" << gdcm::Util::GetMACAddress() << std::endl;
+ std::cout << "Mac Address:" << GDCM_NAME_SPACE::Util::GetMACAddress() << std::endl;
// Unique UID test
std::string gdcmUid;
for (i=0; i<10; i++)
{
- gdcmUid = gdcm::Util::CreateUniqueUID();
+ gdcmUid = GDCM_NAME_SPACE::Util::CreateUniqueUID();
std::cout << "Current UID for gdcm " << gdcmUid << std::endl;
}
std::string a = "MONOCHROME1";
a += '\0';
std::string b = "MONOCHROME1 ";
- std::string c = gdcm::Util::DicomString("MONOCHROME1");
+ std::string c = GDCM_NAME_SPACE::Util::DicomString("MONOCHROME1");
std::string d = "MONOCHROME1";
- if( !gdcm::Util::DicomStringEqual(a,ref) )
+ if( !GDCM_NAME_SPACE::Util::DicomStringEqual(a,ref) )
return 1;
- if( !gdcm::Util::DicomStringEqual(b,ref) )
+ if( !GDCM_NAME_SPACE::Util::DicomStringEqual(b,ref) )
return 1;
- if( !gdcm::Util::DicomStringEqual(c,ref) )
+ if( !GDCM_NAME_SPACE::Util::DicomStringEqual(c,ref) )
return 1;
- if( gdcm::Util::DicomStringEqual(d,ref) )
+ if( GDCM_NAME_SPACE::Util::DicomStringEqual(d,ref) )
return 1;
// ----------------------------------------------------------
-// Let's test gdcm::Debug, now.
- std::cout << "GetDebugFlag : " << gdcm::Debug::GetDebugFlag() <<std::endl;
- gdcm::Debug::SetOutputFileName ("DummyFileNameToWriteTo.txt");
+// Let's test GDCM_NAME_SPACE::Debug, now.
+ std::cout << "GetDebugFlag : " << GDCM_NAME_SPACE::Debug::GetDebugFlag() <<std::endl;
+ GDCM_NAME_SPACE::Debug::SetOutputFileName ("DummyFileNameToWriteTo.txt");
std::cout << "We set a Debug file" <<std::endl;
- if ( !gdcm::Debug::GetDebugFlag() )
+ if ( !GDCM_NAME_SPACE::Debug::GetDebugFlag() )
{
std::cout << "Debug Flag should be TRUE... " << std::endl;
return 1;
}
- std::cout << "GetDebugFlag : " << gdcm::Debug::GetDebugFlag()<<std::endl;
- gdcm::Debug::SetDebugFlag ( false );
- std::cout << "GetDebugFlag : " << gdcm::Debug::GetDebugFlag()<<std::endl;
- gdcm::Debug::SetOutputFileName ("DummyFileNameToWriteTo2.txt");
+ std::cout << "GetDebugFlag : " << GDCM_NAME_SPACE::Debug::GetDebugFlag()<<std::endl;
+ GDCM_NAME_SPACE::Debug::SetDebugFlag ( false );
+ std::cout << "GetDebugFlag : " << GDCM_NAME_SPACE::Debug::GetDebugFlag()<<std::endl;
+ GDCM_NAME_SPACE::Debug::SetOutputFileName ("DummyFileNameToWriteTo2.txt");
std::string s1;
s1="azertyuiop";
- std::cout << s1 << " --> MD5 : " << gdcm::Util::ConvertToMD5(s1)
+ std::cout << s1 << " --> MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1)
<<std::endl;
s1="azertyuiom";
- std::cout << s1 << " --> MD5 : " << gdcm::Util::ConvertToMD5(s1)
+ std::cout << s1 << " --> MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1)
<<std::endl;
s1="azertyuipo";
- std::cout << s1 << " --> MD5 : " << gdcm::Util::ConvertToMD5(s1)
+ std::cout << s1 << " --> MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1)
<<std::endl;
s1="qzertyuiop";
- std::cout << s1 << " --> MD5 : " << gdcm::Util::ConvertToMD5(s1)
+ std::cout << s1 << " --> MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1)
<<std::endl;
s1="zaertyuiop";
- std::cout << s1 << " --> MD5 : " << gdcm::Util::ConvertToMD5(s1)
+ std::cout << s1 << " --> MD5 : " << GDCM_NAME_SPACE::Util::ConvertToMD5(s1)
<<std::endl;
return 0;
}
Program: gdcm
Module: $RCSfile: TestVR.cxx,v $
Language: C++
- Date: $Date: 2005/11/21 12:15:54 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int TestVR(int , char *[])
{
int error = 0;
- gdcm::VR *vr = gdcm::VR::New();
+ GDCM_NAME_SPACE::VR *vr = GDCM_NAME_SPACE::VR::New();
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
// We should test the 27 entries ...
vr->Print( std::cout );
std::cerr << "' /' is recognized as a valid VR" << std::endl;
error++;
}
- if( vr->IsValidVR( gdcm::GDCM_VRUNKNOWN ) )
+ if( vr->IsValidVR( GDCM_NAME_SPACE::GDCM_VRUNKNOWN ) )
{
std::cerr << "' ' is recognized as a valid VR" << std::endl;
error++;
Program: gdcm
Module: $RCSfile: TestWriteSimple.cxx,v $
Language: C++
- Date: $Date: 2006/10/23 15:49:14 $
- Version: $Revision: 1.50 $
+ Date: $Date: 2007/05/23 14:18:06 $
+ Version: $Revision: 1.51 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Step 1 : Create an empty FileHelper
std::cout << " 1...";
- gdcm::FileHelper *fileH = gdcm::FileHelper::New();
+ GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New();
// Get the (empty) image header.
- gdcm::File *fileToBuild = fileH->GetFile();
+ GDCM_NAME_SPACE::File *fileToBuild = fileH->GetFile();
std::ostringstream str;
// Set the image size
// Set the pixel representation
str.str("");
str << img.sign;
- fileToBuild->InsertEntryString(str.str(),0x0028,0x0103, "US"); // Pixel Representation
+ fileToBuild->InsertEntryString(str.str(),0x0028,0x0103,"US"); // Pixel Representation
fileName << "-" << img.componentSize;
if(img.sign == 0)
else
fileName << "S";
- fileToBuild->InsertEntryString("0",0x0008,0x0000, "UL"); // Should be removed
+ fileToBuild->InsertEntryString("0",0x0008,0x0000,"UL"); // Should be removed
// except for ACR
switch (img.writeMode)
{
// Set the samples per pixel
str.str("");
str << img.components;
- fileToBuild->InsertEntryString(str.str(),0x0028,0x0002, "US"); // Samples per Pixel
+ fileToBuild->InsertEntryString(str.str(),0x0028,0x0002,"US"); // Samples per Pixel
// Step 2 : Create the output image
std::cout << "2...";
// Step 5 : Read the written image
std::cout << "5..." << std::endl;
// old form.
- //gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() );
+ //GDCM_NAME_SPACE::FileHelper *reread = new GDCM_NAME_SPACE::FileHelper( fileName.str() );
// Better use :
- gdcm::File *f = gdcm::File::New( );
- f->SetLoadMode(gdcm::LD_ALL);
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New( );
+ f->SetLoadMode(GDCM_NAME_SPACE::LD_ALL);
f->SetFileName( fileName.str() );
//reread->SetFileName( fileName.str() );
- //reread->SetLoadMode(gdcm::LD_ALL); // Load everything
+ //reread->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); // Load everything
// Possible values are
- // gdcm::LD_ALL,
- // gdcm::LD_NOSEQ,
- // gdcm::LD_NOSHADOW,
- // gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW,
- // gdcm::LD_NOSHADOWSEQ
+ // GDCM_NAME_SPACE::LD_ALL,
+ // GDCM_NAME_SPACE::LD_NOSEQ,
+ // GDCM_NAME_SPACE::LD_NOSHADOW,
+ // GDCM_NAME_SPACE::LD_NOSEQ|GDCM_NAME_SPACE::LD_NOSHADOW,
+ // GDCM_NAME_SPACE::LD_NOSHADOWSEQ
f->Load();
// reread->Load();
- gdcm::FileHelper *reread = gdcm::FileHelper::New( f );
+ GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( f );
reread->Print();
return 1;
}
- // gdcm::Debug::DebugOn();
+ // GDCM_NAME_SPACE::Debug::DebugOn();
int ret=0;
int i=0;
Program: gdcm
Module: $RCSfile: gdcmConfigure.h.in,v $
Language: C++
- Date: $Date: 2005/10/27 20:43:53 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2007/05/23 14:18:03 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#cmakedefine GDCM_LEGACY_REMOVE
#cmakedefine GDCM_LEGACY_SILENT
+/*--------------------------------------------------------------------------*/
+/* Will be usefull to use 2 different versions of gdcm. */
+/* e.g. : ITK uses gdcm1.2; vtkgdcmImageReader uses gdcm1.3 */
+
+#define GDCM_NAME_SPACE @GDCM_NAME_SPACE@
#endif
#include "gdcmDicomDirPatient.h"
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirVisit.h"
+#include "gdcmDicomDirPrivate.h"
#include "gdcmDirList.h"
#include "gdcmDocEntrySet.h"
#include "gdcmDocument.h"
#include "gdcmDictGroupName.h"
/// This is required in order to avoid %including all the gdcm include files.
-using namespace gdcm;
+using namespace GDCM_NAME_SPACE;
%}
////////////////////////////////////////////////
// Convert a DocEntry * to the real derived class
-%typemap(out) gdcm::DocEntry *
+%typemap(out) GDCM_NAME_SPACE::DocEntry *
{
PyObject *newEntry;
if($1)
{
if(dynamic_cast<SeqEntry *>($1)) // SeqEntry *
- newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__SeqEntry,0);
+ newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_GDCM_NAME_SPACE__SeqEntry,0);
else if(dynamic_cast<DataEntry *>($1)) // DataEntry *
- newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__DataEntry,0);
+ newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_GDCM_NAME_SPACE__DataEntry,0);
else
newEntry = NULL;
}
}
// Same convertion as above but references (since swig converts C++
-// refererences to pointers)
+// references to pointers)
%typemap(python, in) std::string const &
{
$1 = new std::string( PyString_AsString( $input ) );
}
//////////////////// gdcm.TagName versus Python str //////////////////////
-%typemap(out) gdcm::TagName, const gdcm::TagName &
+%typemap(out) GDCM_NAME_SPACE::TagName, const GDCM_NAME_SPACE::TagName &
{
$result = PyString_FromString(($1)->c_str());
}
// Convertion of incoming Python str to STL string
-%typemap(python, in) const gdcm::TagName, gdcm::TagName
+%typemap(python, in) const GDCM_NAME_SPACE::TagName, GDCM_NAME_SPACE::TagName
{
$1 = PyString_AsString($input);
}
// Same convertion as above but references (since swig converts C++
// refererences to pointers)
-%typemap(python, in) gdcm::TagName const &
+%typemap(python, in) GDCM_NAME_SPACE::TagName const &
{
$1 = new std::string( PyString_AsString( $input ) );
}
////////////////////////////////////////////////////////////////////////////
// Because overloading and %rename don't work together (see below Note 1)
// we need to ignore some methods (e.g. the overloaded default constructor).
-// The gdcm::File class doesn't have any SetFilename method anyhow, and
+// The GDCM_NAME_SPACE::File class doesn't have any SetFilename method anyhow, and
// this constructor is only used internaly (not from the API) so this is
// not a big loss.
-%ignore gdcm::binary_write(std::ostream &,uint32_t const &);
-%ignore gdcm::binary_write(std::ostream &,uint16_t const &);
+%ignore GDCM_NAME_SPACE::binary_write(std::ostream &,uint32_t const &);
+%ignore GDCM_NAME_SPACE::binary_write(std::ostream &,uint16_t const &);
-%ignore gdcm::VRKey::operator=(const VRKey &_val);
-%ignore gdcm::VRKey::operator=(const std::string &_val);
-%ignore gdcm::VRKey::operator=(const char *_val);
-%ignore gdcm::VRKey::operator[](const unsigned int &_id) const;
-%ignore gdcm::VRKey::operator[](const unsigned int &_id);
+%ignore GDCM_NAME_SPACE::VRKey::operator=(const VRKey &_val);
+%ignore GDCM_NAME_SPACE::VRKey::operator=(const std::string &_val);
+%ignore GDCM_NAME_SPACE::VRKey::operator=(const char *_val);
+%ignore GDCM_NAME_SPACE::VRKey::operator[](const unsigned int &_id) const;
+%ignore GDCM_NAME_SPACE::VRKey::operator[](const unsigned int &_id);
-%ignore gdcm::TagKey::operator=(const TagKey &_val);
-%ignore gdcm::TagKey::operator[](const unsigned int &_id) const;
-%ignore gdcm::TagKey::operator[](const unsigned int &_id);
+%ignore GDCM_NAME_SPACE::TagKey::operator=(const TagKey &_val);
+%ignore GDCM_NAME_SPACE::TagKey::operator[](const unsigned int &_id) const;
+%ignore GDCM_NAME_SPACE::TagKey::operator[](const unsigned int &_id);
// Ignore all placed in gdcmCommon.h
%ignore GDCM_UNKNOWN;
%include "gdcmDicomDirElement.h"
%include "gdcmDicomDirObject.h"
%include "gdcmDicomDirImage.h"
+%include "gdcmDicomDirPrivate.h"
%include "gdcmDicomDirSerie.h"
+%include "gdcmDicomDirVisit.h"
%include "gdcmDicomDirStudy.h"
%include "gdcmDicomDirPatient.h"
%include "gdcmDicomDirMeta.h"
Program: gdcm
Module: $RCSfile: gdcmCommandPy.h,v $
Language: C++
- Date: $Date: 2005/11/29 08:32:40 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmCommand.h"
#include "Python.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmArgMgr.cxx,v $
Language: C++
- Date: $Date: 2006/05/31 16:39:25 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmArgMgr.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmArgMgr.h,v $
Language: C++
- Date: $Date: 2006/01/26 16:01:04 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdio.h> // for FILE
#include <stdlib.h> // For atof
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
#define ID_RFILE_TEXT "rt"
Program: gdcm
Module: $RCSfile: gdcmBase.cxx,v $
Language: C++
- Date: $Date: 2005/10/20 15:24:08 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmBase.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmBase.h,v $
Language: C++
- Date: $Date: 2005/10/23 15:32:30 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmCommon.h"
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmCallbackCommand.cxx,v $
Language: C++
- Date: $Date: 2005/11/29 17:21:33 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ---------------------------------------------------------------
#include "gdcmCallbackCommand.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmCallbackCommand.h,v $
Language: C++
- Date: $Date: 2005/11/28 15:20:35 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmCommand.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmCommand.cxx,v $
Language: C++
- Date: $Date: 2005/11/28 16:31:22 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ---------------------------------------------------------------
#include "gdcmCommand.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmCommand.h,v $
Language: C++
- Date: $Date: 2005/11/28 16:31:22 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRefCounter.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class CommandManager;
Program: gdcm
Module: $RCSfile: gdcmCommandManager.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:05:11 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmCommand.h"
#include <typeinfo> // for typeif (needed by __BORLANDC__ v6)
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
CommandManager CommandManager::Instance;
Program: gdcm
Module: $RCSfile: gdcmCommandManager.h,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <map>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class Command;
Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.114 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.115 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
/// \brief namespace for Grass root DiCoM
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
// Centralize information about the gdcm dictionary in only one file:
Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2006/07/10 08:27:27 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.42 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <ctype.h> // for isdigit
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff
}
else
{
- s << " [gdcm::too long for print (" << cleanString.length() << ") ]";
+ s << " [GDCM_NAME_SPACE::too long for print (" << cleanString.length() << ") ]";
}
}
else
Program: gdcm
Module: $RCSfile: gdcmDataEntry.h,v $
Language: C++
- Date: $Date: 2006/07/10 08:27:28 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <vector> // for GetDSValue
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmDebug.cxx,v $
Language: C++
- Date: $Date: 2006/01/03 14:28:53 $
- Version: $Revision: 1.30 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.31 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Warning message level to be displayed
Program: gdcm
Module: $RCSfile: gdcmDebug.h,v $
Language: C++
- Date: $Date: 2006/05/30 08:12:51 $
- Version: $Revision: 1.55 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.56 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <assert.h>
#include <errno.h>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class CommandManager;
*
* A debugging message is only shown if the flag is on (DebugFlag)
* This is static var and can be set at beginning of code:
- * gdcm::Debug::SetDebugOn();
+ * GDCM_NAME_SPACE::Debug::SetDebugOn();
*
* Warning : Warns the user when some oddity occured, and we used an heuristics
* to bypass the trouble.
/// (used to warn user when file contains some oddity)
static void SetDebugFlag (bool flag);
/// \brief Gets the debug flag value
- static bool GetDebugFlag () {return DebugFlag;}
+ static bool GetDebugFlag () {return DebugFlag; }
/// \brief Sets the Debug Flag to true
static void DebugOn () { SetDebugFlag(true); }
/// \brief Sets the Debug Flag to false
/// log messages are displayed.
static void SetLogFlag (bool flag);
/// \brief Gets the Log flag value
- static bool GetLogFlag () {return LogFlag;}
+ static bool GetLogFlag () {return LogFlag; }
/// \brief Sets the Log Flag to true
static void LogOn () { SetLogFlag(true); }
/// \brief Sets the Log Flag to false
/// warning messages are displayed.
static void SetWarningFlag (bool flag);
/// \brief Gets the warning flag value
- static bool GetWarningFlag () {return WarningFlag;}
+ static bool GetWarningFlag () {return WarningFlag; }
/// \brief Sets the Warning Flag to true
static void WarningOn () { SetWarningFlag(true); }
/// \brief Sets the Warning Flag to false
osmacro << "In " __FILE__ ", line " << __LINE__ \
<< ", function " << GDCM_FUNCTION << "\n" \
<< adds << msg << "\n\n"; \
- gdcm::Debug::SendToOutput(type,osmacro.str(),obj); \
+ GDCM_NAME_SPACE::Debug::SendToOutput(type,osmacro.str(),obj);\
}
// ------------------------------------------------------------------------
adds += strerror(errno); \
adds += "\n"; \
} \
- gdcmMessageBodyMacro(gdcm::CMD_DEBUG,obj,msg,adds); \
+ gdcmMessageBodyMacro(GDCM_NAME_SPACE::CMD_DEBUG,obj,msg,adds);\
} \
}
#define gdcmDebugMacro(msg) \
#define gdcmLogBodyMacro(obj, msg) \
{ \
if( Debug::GetLogFlag() ) \
- gdcmMessageBodyMacro(gdcm::CMD_LOG,obj,msg,""); \
+ gdcmMessageBodyMacro(GDCM_NAME_SPACE::CMD_LOG,obj,msg,"");\
}
#define gdcmLogMacro(msg) \
gdcmLogBodyMacro(this,msg)
#define gdcmWarningBodyMacro(obj, msg) \
{ \
if( Debug::GetWarningFlag() ) \
- gdcmMessageBodyMacro(gdcm::CMD_WARNING,obj,msg,""); \
+ gdcmMessageBodyMacro(GDCM_NAME_SPACE::CMD_WARNING,obj,msg,"");\
}
#define gdcmWarningMacro(msg) \
gdcmWarningBodyMacro(this,msg)
// -> Rien compris! JPRx
#define gdcmErrorBodyMacro(obj, msg) \
{ \
- gdcmMessageBodyMacro(gdcm::CMD_ERROR,obj,msg,""); \
+ gdcmMessageBodyMacro(GDCM_NAME_SPACE::CMD_ERROR,obj,msg,"");\
}
#define gdcmErrorMacro(msg) \
gdcmErrorBodyMacro(this,msg)
{ \
if( !(arg) ) \
{ \
- gdcmMessageBodyMacro(gdcm::CMD_ASSERT,obj,"",""); \
+ gdcmMessageBodyMacro(GDCM_NAME_SPACE::CMD_ASSERT,obj,"","");\
assert ( arg ); \
} \
}
Program: gdcm
Module: $RCSfile: gdcmDefaultDicts.cxx.in,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDictGroupName.h"
#include "gdcmDicomDirElement.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
typedef struct
Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2007/04/12 13:06:03 $
- Version: $Revision: 1.192 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.193 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// PRIVATE
// ENCAP DOC
//
+
+/*
+
+// see also : ftp://medical.nema.org/medical/dicom/final/cp343_ft.doc
+
+RELATIONSHIP BETWEEN DIRECTORY RECORDS
+
+Directory Record Type Directory Record Types which may be included
+ in the next lower-level directory Entity
+
+(Root Directory Entity) PATIENT, TOPIC, PRIVATE
+
+PATIENT STUDY, PRIVATE
+
+STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT, PRIVATE
+
+SERIES IMAGE, OVERLAY, MODALITY LUT, VOI LUT, CURVE,
+ STORED PRINT, RT DOSE, RT STRUCTURE SET, RT PLAN,
+ RT TREAT RECORD, PRESENTATION, WAVEFORM, SR DOCUMENT,
+ KEY OBJECT DOC, SPECTROSCOPY, RAW DATA, PRIVATE
+
+IMAGE PRIVATE
+OVERLAY PRIVATE
+MODALITY LUT PRIVATE
+VOI LUT PRIVATE
+CURVE PRIVATE
+STORED PRINT PRIVATE
+RT DOSE PRIVATE
+RT STRUCTURE SET PRIVATE
+RT PLAN PRIVATE
+RT TREAT RECORD PRIVATE
+PRESENTATION PRIVATE
+WAVEFORM PRIVATE
+SR DOCUMENT PRIVATE
+KEY OBJECT DOC PRIVATE
+SPECTROSCOPY PRIVATE
+RAW DATA PRIVATE
+
+TOPIC STUDY, SERIES, IMAGE, OVERLAY, MODALITY LUT, VOI LUT,
+ CURVE, STORED PRINT, RT DOSE, RT STRUCTURE SET,
+ RT PLAN, RT TREAT RECORD, PRESENTATION, WAVEFORM,
+ SR DOCUMENT, KEY OBJECT DOC, SPECTROSCOPY, RAW DATA,
+ PRIVATE
+
+VISIT PRIVATE
+
+RESULTS INTERPRETATION, PRIVATE
+
+INTERPRETATION PRIVATE
+STUDY COMPONENT PRIVATE
+PRIVATE PRIVATE, (any of the above as privately defined)
+MRDR (Not applicable)
+
+Note : Directory Record Types PRINT QUEUE, FILM SESSION, FILM BOX, and
+ IMAGE BOX were previously defined in DICOM. They have been retired.
+ See PS 3.3-1998.
+*/
+
// ----------------------
// The current gdcm version only deals with :
//
// Treelike structure management will have to be upgraded
// ----------------------------------------------------------------------------
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
{
// The SeqEntries of "Directory Record Sequence" are parsed.
// When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
+ // N.B. : VISIT, PRIVATE not fully dealt with
// 1 - we save the beginning iterator
// 2 - we continue to parse
// 3 - we find an other tag
// It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
// nor an 'IMAGE' SQItem. Skip to next item.
gdcmWarningMacro( " -------------------------------------------"
- << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : "
+ << "a non PATIENT/STUDY/SERIE/IMAGE /VISIT/PRIVATE SQItem was found : "
<< v);
// FIXME : deal with other item types !
Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.78 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ 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 <list>
#include <vector>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class DicomDirPatient;
//-----------------------------------------------------------------------------
/**
* \brief DicomDir defines an object representing a DICOMDIR in memory
- * as a tree-like structure DicomDirPatient
- * -> DicomDirStudy
- * -> DicomDirSerie
- * -> DicomDirImage
+ * as a tree-like structure :
+ *
+ * ->DicomDirPatient
+ * -> DicomDirStudy
+ * -> DicomDirVisit
+ * -> DicomDirSerie
+ * -> DicomDirImage
+ * -> DicomDirPrivate (for Siemens CSA non image)
*/
class GDCM_EXPORT DicomDir: public Document
{
GDCM_DICOMDIR_STUDY,
GDCM_DICOMDIR_SERIE,
GDCM_DICOMDIR_VISIT,
- GDCM_DICOMDIR_IMAGE
+ GDCM_DICOMDIR_IMAGE,
+ GDCM_DICOMDIR_PRIVATE
} DicomDirType;
protected:
void CreateDicomDir();
bool DoTheLoadingJob();
bool AddPatientToEnd(DicomDirPatient *dd);
- bool AddStudyToEnd (DicomDirStudy *dd);
- bool AddSerieToEnd (DicomDirSerie *dd);
- bool AddVisitToEnd (DicomDirVisit *dd);
- bool AddImageToEnd (DicomDirImage *dd);
+ bool AddStudyToEnd (DicomDirStudy *dd);
+ bool AddSerieToEnd (DicomDirSerie *dd);
+ bool AddVisitToEnd (DicomDirVisit *dd);
+ bool AddImageToEnd (DicomDirImage *dd);
bool AddPrivateToEnd(DicomDirPrivate *dd);
void SetElements(std::string const &path, VectDocument const &list);
Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.44 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generate function, to fill up the default elements for
Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.h,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.39 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.40 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDicomDirImage.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:49 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmGlobal.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomDirImage.h,v $
Language: C++
- Date: $Date: 2005/11/21 09:46:25 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmDicomDirMeta.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.36 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.37 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmUtil.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomDirMeta.h,v $
Language: C++
- Date: $Date: 2005/11/21 09:46:25 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDicomDirObject.cxx,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDictSet.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmDicomDirObject.h,v $
Language: C++
- Date: $Date: 2005/10/25 14:52:33 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
#include <list>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class DicomDirObject;
Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.cxx,v $
Language: C++
- Date: $Date: 2005/11/29 12:48:46 $
- Version: $Revision: 1.40 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.41 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSQItem.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.h,v $
Language: C++
- Date: $Date: 2005/11/29 12:48:46 $
- Version: $Revision: 1.30 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.31 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class DicomDirStudy;
Program: gdcm
Module: $RCSfile: gdcmDicomDirPrivate.cxx,v $
Language: C++
- Date: $Date: 2007/03/26 13:32:54 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmGlobal.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomDirPrivate.h,v $
Language: C++
- Date: $Date: 2007/03/26 13:32:54 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
Program: gdcm
Module: $RCSfile: gdcmDicomDirSerie.cxx,v $
Language: C++
- Date: $Date: 2007/05/23 14:01:44 $
- Version: $Revision: 1.42 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmGlobal.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Privates.clear();
}
-
/**
* \brief Remove all 'Images' in the serie
*/
}
Images.clear();
}
+
/**
* \brief Get the first entry while visiting the DicomDirImage
* \return The first DicomDirImage if DicomDirserie not empty, otherwhise NULL
Program: gdcm
Module: $RCSfile: gdcmDicomDirSerie.h,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class DicomDirImage;
class DicomDirPrivate;
Program: gdcm
Module: $RCSfile: gdcmDicomDirStudy.cxx,v $
Language: C++
- Date: $Date: 2005/11/29 12:48:46 $
- Version: $Revision: 1.42 $
+ Date: $Date: 2007/05/23 14:18:08 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirVisit.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomDirStudy.h,v $
Language: C++
- Date: $Date: 2005/11/29 12:48:46 $
- Version: $Revision: 1.32 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.33 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class DicomDirSerie;
class DicomDirVisit;
Program: gdcm
Module: $RCSfile: gdcmDicomDirVisit.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:49 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmGlobal.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomDirVisit.h,v $
Language: C++
- Date: $Date: 2005/11/21 09:46:25 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirObject.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
Program: gdcm
Module: $RCSfile: gdcmDicomEntry.cxx,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
//#include <stdio.h> // for sprintf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDicomEntry.h,v $
Language: C++
- Date: $Date: 2006/04/13 08:06:56 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmVRKey.h"
#include "gdcmTagKey.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2007/04/12 13:22:49 $
- Version: $Revision: 1.86 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.87 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <iomanip>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the Dicom Dictionnary,
Program: gdcm
Module: $RCSfile: gdcmDict.h,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.49 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.50 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
#include <map>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:13 $
- Version: $Revision: 1.60 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.61 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
#include <stdio.h> // for sprintf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDictEntry.h,v $
Language: C++
- Date: $Date: 2005/11/29 17:21:34 $
- Version: $Revision: 1.44 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmTagKey.h"
#include "gdcmVRKey.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class VRKey;
Program: gdcm
Module: $RCSfile: gdcmDictGroupName.cxx,v $
Language: C++
- Date: $Date: 2005/11/21 09:46:25 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <iomanip>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the 'Group Name'
Program: gdcm
Module: $RCSfile: gdcmDictGroupName.h,v $
Language: C++
- Date: $Date: 2005/11/28 16:31:23 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2006/05/12 19:09:55 $
- Version: $Revision: 1.77 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.78 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdlib.h> // For getenv
#include <stdio.h> // For sprintf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDictSet.h,v $
Language: C++
- Date: $Date: 2006/03/22 13:19:25 $
- Version: $Revision: 1.53 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.54 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <map>
#include <list>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
typedef std::map<DictKey, Dict*> DictSetHT;
Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2006/11/15 15:53:08 $
- Version: $Revision: 1.60 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.61 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <sys/types.h>
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDirList.h,v $
Language: C++
- Date: $Date: 2006/11/15 15:53:08 $
- Version: $Revision: 1.32 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.33 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <vector>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
typedef std::vector<std::string> DirListType;
Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2007/02/23 15:29:56 $
- Version: $Revision: 1.87 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.88 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iomanip> // for std::ios::left, ...
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDocEntry.h,v $
Language: C++
- Date: $Date: 2006/07/06 16:57:06 $
- Version: $Revision: 1.66 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.67 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class File;
class SeqEntry;
Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.cxx,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.h,v $
Language: C++
- Date: $Date: 2005/11/18 11:54:01 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmFile.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2007/04/12 13:22:49 $
- Version: $Revision: 1.73 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.74 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <mem.h> // for memset
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.h,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.68 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.69 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class DocEntry;
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2007/04/12 13:22:49 $
- Version: $Revision: 1.357 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.358 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <mem.h> // for memset
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Force Loading some more elements if user asked to.
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
for (ListElements::iterator it = UserForceLoadList.begin();
it != UserForceLoadList.end();
++it)
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2006/07/10 09:41:46 $
- Version: $Revision: 1.142 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.143 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class SeqEntry;
class Dict;
Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:05:11 $
- Version: $Revision: 1.75 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.76 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSeqEntry.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmElementSet.h,v $
Language: C++
- Date: $Date: 2006/01/31 11:39:47 $
- Version: $Revision: 1.54 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.55 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
Program: gdcm
Module: $RCSfile: gdcmException.cxx,v $
Language: C++
- Date: $Date: 2005/07/02 18:09:36 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <typeinfo>
#include <stdlib.h> // for exit
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Exception
Program: gdcm
Module: $RCSfile: gdcmException.h,v $
Language: C++
- Date: $Date: 2005/09/02 07:10:03 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <exception>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2007/04/12 13:22:49 $
- Version: $Revision: 1.329 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.330 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdio.h> //sscanf
#include <stdlib.h> // for atoi
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
{
std::fstream *fp = new std::fstream(Filename.c_str(),
std::ios::in | std::ios::out | std::ios::binary);
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
uint32_t offset;
uint32_t lgth;
uint32_t valLgth = 0;
}
else
{
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
for (ListElements::iterator it = UserAnonymizeList.begin();
it != UserAnonymizeList.end();
++it)
Program: gdcm
Module: $RCSfile: gdcmFile.h,v $
Language: C++
- Date: $Date: 2006/11/15 15:54:15 $
- Version: $Revision: 1.130 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.131 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmTagKey.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class RLEFramesInfo;
Module: $RCSfile: gdcmFileHelper.cxx,v $
Language: C++
- Date: $Date: 2007/04/12 13:22:49 $
- Version: $Revision: 1.111 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.112 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
typedef std::map<uint16_t, int> GroupHT; // Hash Table
//-------------------------------------------------------------------------
// Patient Orientation
// Can be computed from (0020|0037) : Image Orientation (Patient)
- gdcm::Orientation *o = gdcm::Orientation::New();
+ GDCM_NAME_SPACE::Orientation *o = GDCM_NAME_SPACE::Orientation::New();
std::string ori = o->GetOrientation ( FileInternal );
o->Delete();
if (ori != "\\" && ori != GDCM_UNFOUND)
Program: gdcm
Module: $RCSfile: gdcmFileHelper.h,v $
Language: C++
- Date: $Date: 2006/07/06 12:38:06 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.47 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmVRKey.h"
#include "gdcmFile.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//class File;
class DataEntry;
Program: gdcm
Module: $RCSfile: gdcmGlobal.cxx,v $
Language: C++
- Date: $Date: 2006/07/06 15:08:10 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDictSet.h"
#include "gdcmDicomDirElement.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief Those global string that are returned by reference everywhere in
Program: gdcm
Module: $RCSfile: gdcmGlobal.h,v $
Language: C++
- Date: $Date: 2007/03/23 15:05:10 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmCommon.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class DictSet;
class VR;
Program: gdcm
Module: $RCSfile: gdcmJPEGFragment.cxx,v $
Language: C++
- Date: $Date: 2005/11/28 17:24:21 $
- Version: $Revision: 1.17 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.18 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmJPEGFragment.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// For JPEG 2000, body in file gdcmJpeg2000.cxx
Program: gdcm
Module: $RCSfile: gdcmJPEGFragment.h,v $
Language: C++
- Date: $Date: 2005/11/28 17:24:21 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.21 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief *very* internal class . Shouldn't appear here !
Program: gdcm
Module: $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $
Language: C++
- Date: $Date: 2005/11/28 16:50:32 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.21 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmJPEGFragmentsInfo.h,v $
Language: C++
- Date: $Date: 2005/11/18 14:49:15 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief Utility class for gathering the informations of the collection
Program: gdcm
Module: $RCSfile: gdcmJpeg.cxx,v $
Language: C++
- Date: $Date: 2006/01/27 10:01:34 $
- Version: $Revision: 1.55 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.56 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "jdatasrc.cxx"
#include "jdatadst.cxx"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
Program: gdcm
Module: $RCSfile: gdcmJpeg2000.cxx,v $
Language: C++
- Date: $Date: 2006/05/15 15:24:43 $
- Version: $Revision: 1.42 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
}
}
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmJpegLS.cxx,v $
Language: C++
- Date: $Date: 2005/05/24 09:11:44 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmMpeg.cxx,v $
Language: C++
- Date: $Date: 2006/05/30 08:19:25 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return 0;
}
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
static int Headers();
Program: gdcm
Module: $RCSfile: gdcmOrientation.cxx,v $
Language: C++
- Date: $Date: 2006/11/15 15:54:15 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2007/05/23 14:18:10 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include <math.h> // for sqrt
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//--------------------------------------------------------------------
// THERALYS Algorithm to determine the most similar basic orientation
Program: gdcm
Module: $RCSfile: gdcmOrientation.h,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:14 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRefCounter.h"
#include <map>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
typedef struct
{
Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2006/08/30 13:31:05 $
- Version: $Revision: 1.114 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.115 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <mem.h> // for memset
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//bool ReadMPEGFile (std::ifstream *fp, char *inputdata, size_t lenght);
Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.h,v $
Language: C++
- Date: $Date: 2006/03/29 16:09:48 $
- Version: $Revision: 1.30 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.31 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class File;
class RLEFramesInfo;
Program: gdcm
Module: $RCSfile: gdcmPixelWriteConvert.cxx,v $
Language: C++
- Date: $Date: 2005/10/23 15:09:19 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmPixelWriteConvert.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmPixelWriteConvert.h,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:15 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmCommon.h"
#include "gdcmBase.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief Utility container for gathering the various forms the pixel data
Program: gdcm
Module: $RCSfile: gdcmRLEFrame.cxx,v $
Language: C++
- Date: $Date: 2005/11/28 17:24:21 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRLEFrame.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmRLEFrame.h,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:15 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.21 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief Utility class for summerizing the informations of a SINGLE RLE
Program: gdcm
Module: $RCSfile: gdcmRLEFramesInfo.cxx,v $
Language: C++
- Date: $Date: 2006/03/29 16:09:48 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <mem.h> // for memset
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmRLEFramesInfo.h,v $
Language: C++
- Date: $Date: 2006/03/29 16:09:48 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.23 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief Utility class for gathering the informations of the collection
Program: gdcm
Module: $RCSfile: gdcmRefCounter.cxx,v $
Language: C++
- Date: $Date: 2005/10/20 15:24:10 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRefCounter.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmRefCounter.h,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//#include "gdcmDebug.h"
#include <typeinfo>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:15 $
- Version: $Revision: 1.84 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.85 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmSQItem.h,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:15 $
- Version: $Revision: 1.51 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.52 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class DocEntry;
Program: gdcm
Module: $RCSfile: gdcmSeqEntry.cxx,v $
Language: C++
- Date: $Date: 2006/04/13 08:05:52 $
- Version: $Revision: 1.67 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ 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 <iomanip>
#include <fstream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Program: gdcm
Module: $RCSfile: gdcmSeqEntry.h,v $
Language: C++
- Date: $Date: 2006/04/13 08:05:52 $
- Version: $Revision: 1.42 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <list>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class SQItem;
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2006/05/30 08:10:19 $
- Version: $Revision: 1.53 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.54 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <map>
#include <stdio.h> //for sscanf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
FileList *l = GetFirstSingleSerieUIDFileSet();
while (l)
{
- // For all the gdcm::File of a File set
- for (gdcm::FileList::iterator it = l->begin();
+ // For all the GDCM_NAME_SPACE::File of a File set
+ for (GDCM_NAME_SPACE::FileList::iterator it = l->begin();
it != l->end();
++it)
{
// Public
/**
- * \brief add a gdcm::File to the Fileset corresponding to its Serie UID
+ * \brief add a GDCM_NAME_SPACE::File to the Fileset corresponding to its Serie UID
* @param filename Name of the file to deal with
*/
void SerieHelper::AddFileName(std::string const &filename)
}
/**
- * \brief add a gdcm::File to the first (and supposed to be unique) file set
- * of the gdcm::SerieHelper.
+ * \brief add a GDCM_NAME_SPACE::File to the first (and supposed to be unique) file set
+ * of the GDCM_NAME_SPACE::SerieHelper.
* \warning : this method should be used by aware users only!
- * Passing a gdcm::File* has the same effect than passing a file name!
+ * Passing a GDCM_NAME_SPACE::File* has the same effect than passing a file name!
* \todo : decide which one is wrong (the method, or the commentary)!
* the following comment doesn't match the method :-(
* User is supposed to know the files he want to deal with
* vtkGdcmReader parsing twice the same files.
* *no* coherence check is performed, but those specified
* by SerieHelper::AddRestriction()
- * @param header gdcm::File* of the file to deal with
+ * @param header GDCM_NAME_SPACE::File* of the file to deal with
* @return true if file was added, false if file was rejected
*/
bool SerieHelper::AddFile(File *header)
*/
void SerieHelper::Print(std::ostream &os, std::string const &indent)
{
- // For all the Coherent File lists of the gdcm::Serie
+ // For all the Coherent File lists of the GDCM_NAME_SPACE::Serie
SingleSerieUIDFileSetmap::iterator itl = SingleSerieUIDFileSetHT.begin();
if ( itl == SingleSerieUIDFileSetHT.end() )
{
* (he knows more than we do about his images!)
* ex : in tagging series, the only pertnent tag is
* 0018|1312 [In-plane Phase Encoding Direction] value : ROW/COLUMN
- * @param inFile gdcm::File we want to build a Serie Identifier for.
+ * @param inFile GDCM_NAME_SPACE::File we want to build a Serie Identifier for.
* @return the SeriesIdentifier
*/
std::string SerieHelper::CreateUniqueSeriesIdentifier( File *inFile )
{
const ExRule &r = *it2;
std::string s = inFile->GetEntryString( r.group, r.elem );
- if( s == gdcm::GDCM_UNFOUND )
+ if( s == GDCM_NAME_SPACE::GDCM_UNFOUND )
{
s = "";
}
else // Could not open inFile
{
gdcmWarningMacro("Could not parse series info.");
- std::string id = gdcm::GDCM_UNFOUND;
+ std::string id = GDCM_NAME_SPACE::GDCM_UNFOUND;
return id;
}
}
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.h,v $
Language: C++
- Date: $Date: 2006/05/30 08:10:19 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.42 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <map>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
class File;
Program: gdcm
Module: $RCSfile: gdcmTS.cxx,v $
Language: C++
- Date: $Date: 2006/06/08 13:37:33 $
- Version: $Revision: 1.54 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.55 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// PrintFile debug filein=...
// and fix the bugs
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief Transfer Syntaxes gdcm deals with (internal use only)
Program: gdcm
Module: $RCSfile: gdcmTS.h,v $
Language: C++
- Date: $Date: 2006/06/08 13:37:33 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
typedef std::string TSKey;
Program: gdcm
Module: $RCSfile: gdcmTagKey.h,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iomanip> // for std::ios::left, ...
#include <stdio.h> // for ugly sprintf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class TagKey
Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2006/11/08 17:04:32 $
- Version: $Revision: 1.186 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.187 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <thread.h>
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
const std::string Util::GDCM_UID = "1.2.826.0.1.3680043.2.1143";
ghost@aladdin.com
*/
-/* $Id: gdcmUtil.cxx,v 1.186 2006/11/08 17:04:32 jpr Exp $ */
+/* $Id: gdcmUtil.cxx,v 1.187 2007/05/23 14:18:11 jpr Exp $ */
/*
Independent implementation of MD5 (RFC 1321).
Program: gdcm
Module: $RCSfile: gdcmUtil.h,v $
Language: C++
- Date: $Date: 2006/05/31 16:09:29 $
- Version: $Revision: 1.67 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ 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 <vector>
#include <string>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief Here are some utility functions, belonging to the gdcm::Util class,
ghost@aladdin.com
*/
-/* $Id: gdcmUtil.h,v 1.67 2006/05/31 16:09:29 jpr Exp $ */
+/* $Id: gdcmUtil.h,v 1.68 2007/05/23 14:18:11 jpr Exp $ */
/*
Independent implementation of MD5 (RFC 1321).
This code implements the MD5 Algorithm defined in RFC 1321, whose
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2006/08/18 18:34:57 $
- Version: $Revision: 1.54 $
+ Date: $Date: 2007/05/23 14:18:11 $
+ Version: $Revision: 1.55 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <string.h>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the 'Value Representation'
Program: gdcm
Module: $RCSfile: gdcmVR.h,v $
Language: C++
- Date: $Date: 2006/08/18 16:11:36 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2007/05/23 14:18:12 $
+ Version: $Revision: 1.32 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmVRKey.h,v $
Language: C++
- Date: $Date: 2006/05/15 14:47:13 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2007/05/23 14:18:12 $
+ Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iomanip> // important
#include <string>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
class VRKey
Program: gdcm
Module: $RCSfile: gdcmValidator.cxx,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:15 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2007/05/23 14:18:12 $
+ Version: $Revision: 1.15 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <map>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
typedef std::map<uint16_t, int> GroupHT; // Hash Table
{
if ( DataEntry *v = dynamic_cast<DataEntry *>(d) )
{
- if ( v->GetVM() != gdcm::GDCM_UNKNOWN )
+ if ( v->GetVM() != GDCM_NAME_SPACE::GDCM_UNKNOWN )
if ( !CheckVM(v) )
{
if (v->GetVM() == "FIXME" )
Program: gdcm
Module: $RCSfile: gdcmValidator.h,v $
Language: C++
- Date: $Date: 2005/11/28 16:31:24 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2007/05/23 14:18:12 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRefCounter.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
/**
* \brief Class to perform some verifications on a gdcm::Document
Program: gdcm
Module: $RCSfile: gdcmfstream.cxx,v $
Language: C++
- Date: $Date: 2005/06/13 00:22:14 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/05/23 14:18:13 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmfstream.h"
#include <iostream>
-namespace gdcm {
+namespace GDCM_NAME_SPACE {
ifstream::ifstream(const char* filename,openmode mode)
Program: gdcm
Module: $RCSfile: gdcmfstream.h,v $
Language: C++
- Date: $Date: 2005/06/13 00:22:14 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/05/23 14:18:14 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
#include <list>
-namespace gdcm {
+namespace GDCM_NAME_SPACE {
class ifstream : public std::ifstream
{
JOCTET * buffer; /* start of buffer */
boolean start_of_file; /* have we gotten any data yet? */
- gdcm::JPEGFragment *frag;
+ GDCM_NAME_SPACE::JPEGFragment *frag;
size_t bytes_read;
} my_source_mgr;
*/
GLOBAL(void)
-jpeg_stdio_src (j_decompress_ptr cinfo, std::istream * infile, gdcm::JPEGFragment *frag, int flag)
+jpeg_stdio_src (j_decompress_ptr cinfo, std::istream * infile, GDCM_NAME_SPACE::JPEGFragment *frag, int flag)
{
my_src_ptr src;
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff