X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=1625584cb2670c6542cd653c781ead5035d3137b;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=2495ac01dfcd5d8f6bdb056bb287bdb89f5bed2d;hpb=0a9f25290006bdee6be492179f8b0dae7ba1c598;p=gdcm.git diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx index 2495ac01..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/24 14:14:11 $ - Version: $Revision: 1.18 $ + 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,11 +55,11 @@ 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) @@ -68,16 +67,20 @@ void DicomDirObject::FillObject(ListDicomDirMetaElem const &elemList) tmpGr = it->Group; tmpEl = it->Elem; dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetEntry(tmpGr,tmpEl); - entry = new ValEntry(dictEntry); + 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