X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=67ff023baf61206c95c6133a5f878439d028fc43;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=397e4e1b2424a06075df24038e4135e913e3e69e;hpb=5a0d183707a94e875a595036f64d0bd506faf618;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 397e4e1b..67ff023b 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/14 11:28:30 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2005/08/24 12:09:13 $
+  Version:   $Revision: 1.63 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,60 +24,24 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup ElementSet
- * \brief   Constructor from a given ElementSet
+ * \brief   Constructor for a given ElementSet
  */
 //BOZ depthLevel is not usefull anymore
 ElementSet::ElementSet(int depthLevel) 
-              : DocEntrySet()
+          : DocEntrySet()
 {
   (void)depthLevel;
 }
 
 /**
- * \ingroup ElementSet
  * \brief   Canonical destructor.
  */
 ElementSet::~ElementSet() 
 {
-   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
-   {
-      if ( cc->second )
-      {
-         delete cc->second;
-      }
-   }
-   TagHT.clear();
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
-  * \brief   Prints the Header Entries (Dicom Elements)
-  *          from the H Table
-  * @return
-  */ 
-void ElementSet::Print(std::ostream &os)
-{
-   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
-   {
-      DocEntry* entry = i->second;
-
-      entry->SetPrintLevel(PrintLevel);
-      entry->Print(os);   
-
-      if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
-      {
-         (void)seqEntry;
-         // Avoid the newline for a sequence:
-         continue;
-      }
-      os << std::endl;
-   }
+   ClearEntry();
 }
 
 //-----------------------------------------------------------------------------
@@ -85,7 +49,8 @@ void ElementSet::Print(std::ostream &os)
 /**
   * \brief   Writes the Header Entries (Dicom Elements)
   *          from the H Table
-  * @return
+  * @param fp ofstream to write to  
+  * @param filetype filetype
   */ 
 void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
 {
@@ -97,12 +62,6 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
    } 
 }
 
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
-
 /**
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   newEntry entry to add
@@ -111,9 +70,9 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
 {
    const TagKey &key = newEntry->GetKey();
 
-   if( TagHT.count(key) == 1 )
+   if ( TagHT.count(key) == 1 )
    {
-      gdcmVerboseMacro( "Key already present: " << key.c_str());
+      gdcmWarningMacro( "Key already present: " << key );
       return false;
    }
    else
@@ -126,21 +85,19 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
 /**
  * \brief   Clear the hash table from given entry AND delete the entry.
  * @param   entryToRemove Entry to remove AND delete.
- * \warning Some problems when using under Windows... prefer the use of
- *          Initialize / GetNext methods
  */
 bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
 {
    const TagKey &key = entryToRemove->GetKey();
-   if( TagHT.count(key) == 1 )
+   if ( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      gdcmVerboseMacro( "One element erased.");
+      //gdcmWarningMacro( "One element erased.");
       delete entryToRemove;
       return true;
    }
 
-   gdcmVerboseMacro( "Key not present");
+   gdcmWarningMacro( "Key not present : " << key);
    return false ;
 }
 
@@ -151,41 +108,105 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
 bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
 {
    const TagKey &key = entryToRemove->GetKey();
-   if( TagHT.count(key) == 1 )
+   if ( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      gdcmVerboseMacro( "One element erased.");
+      //gdcmWarningMacro( "One element erased.");
       return true;
    }
 
-   gdcmVerboseMacro( "Key not present");
+   gdcmWarningMacro( "Key not present " << key);
    return false ;
 }
 
 /**
- * \brief   Initialise the visit of the Hash table (TagHT)
+ * \brief   delete all entries in the ElementSet
  */
-void ElementSet::InitTraversal()
+void ElementSet::ClearEntry()
+{
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   {
+      if ( cc->second )
+      {
+         delete cc->second;
+      }
+   }
+   TagHT.clear();
+}
+
+/**
+ * \brief   Get the first entry while visiting *the* 'zero level' DocEntrySet
+ *              (DocEntries out of any Sequence)
+ * \return  The first DocEntry if found, otherwhise NULL
+ */
+DocEntry *ElementSet::GetFirstEntry()
 {
    ItTagHT = TagHT.begin();
+   if (ItTagHT != TagHT.end())
+      return  ItTagHT->second;
+   return NULL;
 }
 
 /**
- * \brief   Get the next entry whil visiting the Hash table (TagHT)
+ * \brief   Get the next entry while visiting *the* 'zero level' DocEntrySet
+ *              (DocEntries out of any Sequence) 
+ * \note : meaningfull only if GetFirstEntry already called 
  * \return  The next DocEntry if found, otherwhise NULL
  */
 DocEntry *ElementSet::GetNextEntry()
 {
+   gdcmAssertMacro (ItTagHT != TagHT.end());
+
+   ++ItTagHT;
    if (ItTagHT != TagHT.end())
-   {
-      DocEntry *tmp = ItTagHT->second;
-      ++ItTagHT;
+      return  ItTagHT->second;
+   return NULL;
+}
 
-      return tmp;
-   }
-   else
+/**
+ * \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
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+  * \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
+  */ 
+void ElementSet::Print(std::ostream &os, std::string const & )
+{
+   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      return NULL;
+      DocEntry *entry = i->second;
+
+      entry->SetPrintLevel(PrintLevel);
+      entry->Print(os);   
+
+      if ( dynamic_cast<SeqEntry*>(entry) )
+      {
+         // Avoid the newline for a sequence:
+         continue;
+      }
+      os << std::endl;
    }
 }