X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=e81d6b77294bdae4b7dde26c8ccf2a8e5bebb942;hb=985954a7af00b467b183bb3f5db9dc11f89fcaf5;hp=1d3d8ce28a85857c1cd81a72b6592ad23ad62b90;hpb=d31dacbd4792e49cccecc51ffd9d93fd71541561;p=gdcm.git

diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx
index 1d3d8ce2..e81d6b77 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/12/07 13:39:33 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,14 +24,10 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 /**
- * \ingroup DicomDirObject
  * \brief  Constructor 
  *          
- * @param ptagHT pointer to the HTable (DicomDirObject needs it 
- *               to build the DocEntries)
  * @param depth Sequence depth level
  */
   
@@ -40,50 +36,26 @@ DicomDirObject::DicomDirObject(int depth)
 {
 }
 
-
 /**
- * \ingroup DicomDirObject
  * \brief   Canonical destructor.
  */
 DicomDirObject::~DicomDirObject()
 {
 }
 
-
-
 //-----------------------------------------------------------------------------
 // Public
 
-
-/**
- * \ingroup DicomDirObject
- * \brief   Builds a hash table (multimap) containing 
- *          pointers to all Header Entries (i.e Dicom Element)
- *          related to this 'object'
- * @return
- */ 
-TagDocEntryHT DicomDirObject::GetEntry()
-{
-   TagDocEntryHT HT;
-   DocEntries = GetDocEntries();   
-   for(ListDocEntry::iterator i = DocEntries.begin(); 
-                              i != DocEntries.end(); ++i)
-   {
-      HT[(*i)->GetKey()] = *i;
-   }
-   return HT;
-}
-
 //-----------------------------------------------------------------------------
 // Protected
 /**
  * \brief   add the 'Object' related Dicom Elements to the listEntries
  *          of a partially created DICOMDIR
+ * @param elemList Element List to add at the right place
  */
-void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList)
+void DicomDirObject::FillObject(ListDicomDirMetaElem const &elemList)
 {
-  // FillObject rempli le SQItem qui sera accroche au bon endroit
-
+  // FillObject fills up the SQItem that will be conneected to the right place
    ListDicomDirMetaElem::const_iterator it;
    uint16_t tmpGr,tmpEl;
    DictEntry *dictEntry;
@@ -94,7 +66,7 @@ void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList)
    {
       tmpGr = it->Group;
       tmpEl = it->Elem;
-      dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetDictEntryByNumber(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);
@@ -102,5 +74,12 @@ void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList)
       AddEntry(entry);
    }   
 }   
-} // end namespace gdcm
 
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm