X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=61f67396687091452a797568a492edb91babcd5c;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=ce17714bcdec2adb015ec3b8e2e1d5e83a1c1f41;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git

diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx
index ce17714b..61f67396 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/06 20:03:27 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2007/05/23 14:18:08 $
+  Version:   $Revision: 1.25 $
                                                                                 
   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 
+namespace GDCM_NAME_SPACE 
 {
-
 //-----------------------------------------------------------------------------
 /**
  * \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::GetEntry()
-{
-   TagDocEntryHT HT;
-   DocEntries = GetDocEntries();   
-   for(ListDocEntry::iterator i = DocEntries.begin(); 
-                              i != DocEntries.end(); ++i)
-   {
-      HT[(*i)->GetKey()] = *i;
-   }
-   return HT;
-}
-
 //-----------------------------------------------------------------------------
 // Protected
 /**
@@ -77,25 +55,33 @@ TagDocEntryHT DicomDirObject::GetEntry()
  */
 void DicomDirObject::FillObject(ListDicomDirMetaElem const &elemList)
 {
-  // FillObject rempli le SQItem qui sera accroche au bon endroit
-
+  // 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;
+   //uint16_t tmpGr,tmpEl;
+   //DictEntry *dictEntry;
+   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()->GetDictEntryByNumber(tmpGr,tmpEl);
-      entry = new ValEntry(dictEntry);
+      //tmpGr = it->Group;
+      //tmpEl = it->Elem;
+      //dictEntry = Global::GetDicts()->GetDefaultPubDict()->GetEntry(tmpGr,tmpEl);
+      //entry = DataEntry::New(dictEntry);
+      entry = DataEntry::New(it->Group, it->Elem, it->VR );
       entry->SetOffset(0); // just to avoid further missprinting
-      entry->SetValue(it->Value);
+      entry->SetString(it->Value);
 
       AddEntry(entry);
-   }   
-}   
-} // end namespace gdcm
+      entry->Delete();
+   } 
+} 
+
+//-----------------------------------------------------------------------------
+// Private
 
+//-----------------------------------------------------------------------------
+// Print
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm