X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=245f99019b95b1102954a405456725f31ef234d5;hb=faf9f777a09c115e44b29d40a0c6ea2d122fc1e7;hp=0a623225fb30808573b679001fae431e3a8e6e02;hpb=4672e071f29ed17f7258b27e40d47642abfbb53f;p=gdcm.git diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx index 0a623225..245f9901 100644 --- a/src/gdcmDicomDirObject.cxx +++ b/src/gdcmDicomDirObject.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirObject.cxx,v $ Language: C++ - Date: $Date: 2004/10/13 14:15:29 $ - Version: $Revision: 1.5 $ + Date: $Date: 2004/12/03 20:16:57 $ + 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 @@ -20,6 +20,8 @@ #include "gdcmGlobal.h" #include "gdcmDebug.h" #include "gdcmValEntry.h" +#include "gdcmDictSet.h" + namespace gdcm { @@ -33,10 +35,9 @@ namespace gdcm * @param depth Sequence depth level */ -DicomDirObject::DicomDirObject(TagDocEntryHT *ptagHT, int depth) +DicomDirObject::DicomDirObject(int depth) : SQItem (depth) { - PtagHT = ptagHT; } @@ -64,11 +65,11 @@ DicomDirObject::~DicomDirObject() TagDocEntryHT DicomDirObject::GetEntry() { TagDocEntryHT HT; - docEntries=GetDocEntries(); - for(ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); ++i) + DocEntries = GetDocEntries(); + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { - HT[(*i)->GetKey()]=*i; + HT[(*i)->GetKey()] = *i; } return HT; } @@ -79,11 +80,11 @@ TagDocEntryHT DicomDirObject::GetEntry() * \brief add the 'Object' related Dicom Elements to the listEntries * of a partially created DICOMDIR */ -void DicomDirObject::FillObject(ListDicomDirMetaElem elemList) +void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList) { // FillObject rempli le SQItem qui sera accroche au bon endroit - std::list::iterator it; + ListDicomDirMetaElem::const_iterator it; uint16_t tmpGr,tmpEl; DictEntry *dictEntry; ValEntry *entry;