X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=84a5387660514f1ae5d53673b75c5277d790036c;hb=34e322ceb4e12797e6d4cb1e691a36425015d2e0;hp=edbd6a855c24b01871ed77c4003d9ac6618b81e3;hpb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;p=gdcm.git diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx index edbd6a85..84a53876 100644 --- a/src/gdcmDicomDirObject.cxx +++ b/src/gdcmDicomDirObject.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirObject.cxx,v $ Language: C++ - Date: $Date: 2005/01/08 15:03:59 $ - Version: $Revision: 1.15 $ + Date: $Date: 2005/07/12 17:08:12 $ + 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 @@ -24,7 +24,6 @@ namespace gdcm { - //----------------------------------------------------------------------------- /** * \brief Constructor @@ -37,7 +36,6 @@ DicomDirObject::DicomDirObject(int depth) { } - /** * \brief Canonical destructor. */ @@ -45,29 +43,9 @@ DicomDirObject::~DicomDirObject() { } - //----------------------------------------------------------------------------- // Public - -/** - * \brief Builds a hash table (multimap) containing - * pointers to all Header Entries (i.e Dicom Element) - * related to this 'object' - * @return - */ -TagDocEntryHT DicomDirObject::GetEntryHT() -{ - TagDocEntryHT HT; - DocEntries = GetDocEntries(); - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); ++i) - { - HT[(*i)->GetKey()] = *i; - } - return HT; -} - //----------------------------------------------------------------------------- // Protected /** @@ -77,8 +55,7 @@ TagDocEntryHT DicomDirObject::GetEntryHT() */ void DicomDirObject::FillObject(ListDicomDirMetaElem const &elemList) { - // FillObject fills up the SQItem that will be conneected to the right place - + // FillObject fills up the SQItem that will be connected to the right place ListDicomDirMetaElem::const_iterator it; uint16_t tmpGr,tmpEl; DictEntry *dictEntry; @@ -89,13 +66,20 @@ void DicomDirObject::FillObject(ListDicomDirMetaElem const &elemList) { tmpGr = it->Group; tmpEl = it->Elem; - dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetDictEntry(tmpGr,tmpEl); + dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetEntry(tmpGr,tmpEl); entry = new ValEntry(dictEntry); entry->SetOffset(0); // just to avoid further missprinting entry->SetValue(it->Value); AddEntry(entry); } -} -} // end namespace gdcm +} + +//----------------------------------------------------------------------------- +// Private +//----------------------------------------------------------------------------- +// Print + +//----------------------------------------------------------------------------- +} // end namespace gdcm