X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=dbf05c6065215f64dcf39c1dadd5bc4f271ede86;hb=1fe405b2347a5f78d5ecc67d2d81f53bd9c7541d;hp=8f81f255171b9690be8340ec7db9813e298200d9;hpb=a891240601e102b6b07ce593d9b9b28948149e72;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 8f81f255..dbf05c60 100644
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/18 14:28:32 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2005/01/25 15:44:24 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief   Constructor from a given ElementSet
+ * \brief   Constructor for a given ElementSet
  */
 //BOZ depthLevel is not usefull anymore
 ElementSet::ElementSet(int depthLevel) 
@@ -42,21 +42,13 @@ ElementSet::ElementSet(int depthLevel)
  */
 ElementSet::~ElementSet() 
 {
-   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
-   {
-      if ( cc->second )
-      {
-         delete cc->second;
-      }
-   }
-   TagHT.clear();
+   ClearEntry();
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
-  * \brief   Prints the Header Entries (Dicom Elements)
-  *          from the H Table
+  * \brief   Prints the Header Entries (Dicom Elements) from the H Table
   * @param os ostream to write to  
   * @param indent Indentation string to be prepended during printing
   */ 
@@ -69,9 +61,8 @@ void ElementSet::Print(std::ostream &os, std::string const & )
       entry->SetPrintLevel(PrintLevel);
       entry->Print(os);   
 
-      if ( /*SeqEntry *seqEntry = */dynamic_cast<SeqEntry*>(entry) )
+      if ( dynamic_cast<SeqEntry*>(entry) )
       {
-         //(void)seqEntry;
          // Avoid the newline for a sequence:
          continue;
       }
@@ -97,11 +88,20 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
    } 
 }
 
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
+/**
+ * \brief   delete all entries in the ElementSet
+ */
+void ElementSet::ClearEntry()
+{
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   {
+      if ( cc->second )
+      {
+         delete cc->second;
+      }
+   }
+   TagHT.clear();
+}
 
 /**
  * \brief   add a new Dicom Element pointer to the H Table
@@ -187,5 +187,27 @@ DocEntry *ElementSet::GetNextEntry()
    return NULL;
 }
 
+/**
+ * \brief  retrieves a Dicom Element using (group, element)
+ * @param   group  Group number of the searched Dicom Element 
+ * @param   elem Element number of the searched Dicom Element 
+ * @return  
+ */
+DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) 
+{
+   TagKey key = DictEntry::TranslateToKey(group, elem);
+   TagDocEntryHT::iterator it = TagHT.find(key);
+
+   if ( it!=TagHT.end() )
+      return it->second;
+   return NULL;
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm