Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/01/07 22:03:30 $
- Version: $Revision: 1.96 $
+ Date: $Date: 2005/01/12 17:57:58 $
+ Version: $Revision: 1.98 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
else // Only if user passed a DICOMDIR
{
// Directory record sequence
- DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
+ DocEntry *e = GetDocEntry(0x0004, 0x1220);
if ( !e )
{
gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)");
{
tmpGr = it->Group;
tmpEl = it->Elem;
- dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl);
+ dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl);
entry = new ValEntry( dictEntry );
entry->SetOffset(0); // just to avoid further missprinting
entry->SetValue( it->Value );
{
tmpGr = it->Group;
tmpEl = it->Elem;
- dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl);
+ dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl);
entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry !
{
// NULL when we Build Up (ex nihilo) a DICOMDIR
// or when we add the META elems
- val = header->GetEntryByNumber(tmpGr, tmpEl);
+ val = header->GetEntry(tmpGr, tmpEl);
}
else
{
}
else
{
- if ( header->GetEntryLengthByNumber(tmpGr,tmpEl) == 0 )
+ if ( header->GetEntryLength(tmpGr,tmpEl) == 0 )
val = it->Value;
}
// + loop to 1 -
// Directory record sequence
- DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
+ DocEntry *e = GetDocEntry(0x0004, 0x1220);
if ( !e )
{
gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)");
return;
}
- DicomDirType type; // = DicomDir::GDCM_DICOMDIR_META;
MetaElems = NewMeta();
ListSQItem listItems = s->GetSQItems();
for( ListSQItem::iterator i = listItems.begin();
i !=listItems.end(); ++i )
{
- d = (*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type
+ d = (*i)->GetDocEntry(0x0004, 0x1430); // Directory Record Type
if ( ValEntry* valEntry = dynamic_cast<ValEntry *>(d) )
{
v = valEntry->GetValue();
{
si = new DicomDirPatient();
AddDicomDirPatientToEnd( static_cast<DicomDirPatient *>(si) );
- type = DicomDir::GDCM_DICOMDIR_PATIENT;
}
else if( v == "STUDY " )
{
si = new DicomDirStudy();
AddDicomDirStudyToEnd( static_cast<DicomDirStudy *>(si) );
- type = DicomDir::GDCM_DICOMDIR_STUDY;
}
else if( v == "SERIES" )
{
si = new DicomDirSerie();
AddDicomDirSerieToEnd( static_cast<DicomDirSerie *>(si) );
- type = DicomDir::GDCM_DICOMDIR_SERIE;
}
else if( v == "IMAGE " )
{
si = new DicomDirImage();
AddDicomDirImageToEnd( static_cast<DicomDirImage *>(si) );
- type = DicomDir::GDCM_DICOMDIR_IMAGE;
}
else
{
it != list.end(); ++it )
{
// get the current file characteristics
- patCurName = (*it)->GetEntryByNumber(0x0010,0x0010);
- patCurID = (*it)->GetEntryByNumber(0x0010,0x0011);
- studCurInstanceUID = (*it)->GetEntryByNumber(0x0020,0x000d);
- studCurID = (*it)->GetEntryByNumber(0x0020,0x0010);
- serCurInstanceUID = (*it)->GetEntryByNumber(0x0020,0x000e);
- serCurID = (*it)->GetEntryByNumber(0x0020,0x0011);
+ patCurName = (*it)->GetEntry(0x0010,0x0010);
+ patCurID = (*it)->GetEntry(0x0010,0x0011);
+ studCurInstanceUID = (*it)->GetEntry(0x0020,0x000d);
+ studCurID = (*it)->GetEntry(0x0020,0x0010);
+ serCurInstanceUID = (*it)->GetEntry(0x0020,0x000e);
+ serCurID = (*it)->GetEntry(0x0020,0x0011);
if( patCurName != patPrevName || patCurID != patPrevID || first )
{