Program: gdcm
Module: $RCSfile: gdcmDicomDirObject.cxx,v $
Language: C++
- Date: $Date: 2004/09/23 10:47:10 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2004/10/12 04:35:45 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include "gdcmGlobal.h"
#include "gdcmDebug.h"
#include "gdcmValEntry.h"
+namespace gdcm
+{
//-----------------------------------------------------------------------------
/**
- * \ingroup gdcmDicomDirObject
+ * \ingroup DicomDirObject
* \brief Constructor
*
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it
- * to build the gdcmDocEntries)
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it
+ * to build the DocEntries)
* @param depth Sequence depth level
*/
-gdcmDicomDirObject::gdcmDicomDirObject(TagDocEntryHT *ptagHT, int depth)
- : gdcmSQItem (depth)
+DicomDirObject::DicomDirObject(TagDocEntryHT *ptagHT, int depth)
+ : SQItem (depth)
{
PtagHT = ptagHT;
}
/**
- * \ingroup gdcmDicomDirObject
+ * \ingroup DicomDirObject
* \brief Canonical destructor.
*/
-gdcmDicomDirObject::~gdcmDicomDirObject()
+DicomDirObject::~DicomDirObject()
{
}
/**
- * \ingroup gdcmDicomDirObject
+ * \ingroup DicomDirObject
* \brief Builds a hash table (multimap) containing
* pointers to all Header Entries (i.e Dicom Element)
* related to this 'object'
* @return
*/
-TagDocEntryHT gdcmDicomDirObject::GetEntry()
+TagDocEntryHT DicomDirObject::GetEntry()
{
TagDocEntryHT HT;
docEntries=GetDocEntries();
* \brief add the 'Object' related Dicom Elements to the listEntries
* of a partially created DICOMDIR
*/
-void gdcmDicomDirObject::FillObject(std::list<gdcmElement> elemList)
+void DicomDirObject::FillObject(std::list<Element> elemList)
{
// FillObject rempli le SQItem qui sera accroche au bon endroit
- std::list<gdcmElement>::iterator it;
+ std::list<Element>::iterator it;
uint16_t tmpGr,tmpEl;
- gdcmDictEntry *dictEntry;
- gdcmValEntry *entry;
+ DictEntry *dictEntry;
+ ValEntry *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 = gdcmGlobal::GetDicts()->GetDefaultPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
- entry = new gdcmValEntry(dictEntry);
+ tmpGr = it->Group;
+ tmpEl = it->Elem;
+ dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
+ entry = new ValEntry(dictEntry);
entry->SetOffset(0); // just to avoid further missprinting
- entry->SetValue(it->value);
+ entry->SetValue(it->Value);
// dealing with value length ...
AddDocEntry(entry);
}
}
+} // end namespace gdcm
+