X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=1625584cb2670c6542cd653c781ead5035d3137b;hb=5b4a76f5a670626f5ae20714d265b3a50ffa2218;hp=a06a2810ef221d9b7e9d95cfea70de7b4d4a8c96;hpb=ad8f0eb6ea1ad66c443b3640cded8a355efa7b42;p=gdcm.git diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx index a06a2810..1625584c 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/20 16:16:42 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/10/25 09:22:15 $ + 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 @@ -19,12 +19,11 @@ #include "gdcmDicomDirObject.h" #include "gdcmGlobal.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" #include "gdcmDictSet.h" +#include "gdcmDataEntry.h" namespace gdcm { - //----------------------------------------------------------------------------- /** * \brief Constructor @@ -56,28 +55,32 @@ DicomDirObject::~DicomDirObject() */ 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; - ValEntry *entry; + DataEntry *entry; // for all the Elements found in they own part of the DicomDir dict. for(it = elemList.begin(); it != elemList.end(); ++it) { tmpGr = it->Group; tmpEl = it->Elem; - dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetDictEntry(tmpGr,tmpEl); - entry = new ValEntry(dictEntry); + dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetEntry(tmpGr,tmpEl); + entry = DataEntry::New(dictEntry); entry->SetOffset(0); // just to avoid further missprinting - entry->SetValue(it->Value); + entry->SetString(it->Value); AddEntry(entry); - } -} + entry->Delete(); + } +} //----------------------------------------------------------------------------- // Private +//----------------------------------------------------------------------------- +// Print + //----------------------------------------------------------------------------- } // end namespace gdcm