X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmElementSet.cxx;h=cf778c42745d9a3faf69fe42030045ee36070c5d;hb=d6fa71b6fa0186d6d85edc308741c58f03adf1f3;hp=4338de23255077c62743c683bae7ccc8643d784b;hpb=58156942f515f7d313b9b098156313a44f3b1e2b;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 4338de23..cf778c42 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/07 22:03:30 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/01/20 11:37:37 $
+  Version:   $Revision: 1.47 $
                                                                                 
   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,6 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup ElementSet
  * \brief   Constructor from a given ElementSet
  */
 //BOZ depthLevel is not usefull anymore
@@ -39,7 +38,6 @@ ElementSet::ElementSet(int depthLevel)
 }
 
 /**
- * \ingroup ElementSet
  * \brief   Canonical destructor.
  */
 ElementSet::~ElementSet() 
@@ -59,9 +57,10 @@ ElementSet::~ElementSet()
 /**
   * \brief   Prints the Header Entries (Dicom Elements)
   *          from the H Table
-  * @return
+  * @param os ostream to write to  
+  * @param indent Indentation string to be prepended during printing
   */ 
-void ElementSet::Print(std::ostream &os)
+void ElementSet::Print(std::ostream &os, std::string const & )
 {
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
@@ -70,9 +69,8 @@ void ElementSet::Print(std::ostream &os)
       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;
       }
@@ -85,7 +83,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,6 +96,96 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
    } 
 }
 
+
+/**
+ * \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);
+   if ( !TagHT.count(key))
+   {
+      return NULL;
+   }
+   return TagHT.find(key)->second;
+}
+
+/**
+ * \brief  Same as \ref Document::GetDocEntry except it only
+ *         returns a result when the corresponding entry is of type
+ *         ValEntry.
+ * @param   group  Group number of the searched Dicom Element 
+ * @param   elem Element number of the searched Dicom Element  
+ * @return When present, the corresponding ValEntry. 
+ */
+ValEntry *ElementSet::GetValEntry(uint16_t group, uint16_t elem)
+{
+   DocEntry *currentEntry = GetDocEntry(group, elem);
+   if ( !currentEntry )
+   {
+      return 0;
+   }
+   if ( ValEntry *entry = dynamic_cast<ValEntry*>(currentEntry) )
+   {
+      return entry;
+   }
+   gdcmVerboseMacro( "Unfound ValEntry.");
+
+   return 0;
+}
+
+/**
+ * \brief  Same as \ref Document::GetDocEntry except it only
+ *         returns a result when the corresponding entry is of type
+ *         BinEntry.
+ * @param   group  Group number of the searched Dicom Element 
+ * @param   elem Element number of the searched Dicom Element  
+ * @return When present, the corresponding BinEntry. 
+ */
+BinEntry *ElementSet::GetBinEntry(uint16_t group, uint16_t elem)
+{
+   DocEntry *currentEntry = GetDocEntry(group, elem);
+   if ( !currentEntry )
+   {
+      return 0;
+   }
+   if ( BinEntry *entry = dynamic_cast<BinEntry*>(currentEntry) )
+   {
+      return entry;
+   }
+   gdcmVerboseMacro( "Unfound BinEntry.");
+
+   return 0;
+}
+
+/**
+ * \brief  Same as \ref Document::GetDocEntry except it only
+ *         returns a result when the corresponding entry is of type
+ *         SeqEntry.
+ * @param   group  Group number of the searched Dicom Element 
+ * @param   elem Element number of the searched Dicom Element  
+ * @return When present, the corresponding SeqEntry. 
+ */
+SeqEntry *ElementSet::GetSeqEntry(uint16_t group, uint16_t elem)
+{
+   DocEntry *currentEntry = GetDocEntry(group, elem);
+   if ( !currentEntry )
+   {
+      return 0;
+   }
+   if ( SeqEntry *entry = dynamic_cast<SeqEntry*>(currentEntry) )
+   {
+      return entry;
+   }
+   gdcmVerboseMacro( "Unfound SeqEntry.");
+
+   return 0;
+}
+
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -126,8 +215,6 @@ 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)
 {
@@ -135,7 +222,7 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      gdcmVerboseMacro( "One element erased.");
+      //gdcmVerboseMacro( "One element erased.");
       delete entryToRemove;
       return true;
    }
@@ -154,7 +241,7 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      gdcmVerboseMacro( "One element erased.");
+      //gdcmVerboseMacro( "One element erased.");
       return true;
    }
 
@@ -163,30 +250,30 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
 }
 
 /**
- * \brief   Initialise the visit of the Hash table (TagHT)
+ * \brief   Get the first entry while visiting the DocEntrySet
+ * \return  The first DocEntry if found, otherwhise NULL
  */
-void ElementSet::Initialize()
+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 Hash table (TagHT)
+ * \note : meaningfull only if GetFirstEntry already called 
  * \return  The next DocEntry if found, otherwhise NULL
  */
 DocEntry *ElementSet::GetNextEntry()
 {
-   if (ItTagHT != TagHT.end())
-   {
-      DocEntry *tmp = ItTagHT->second;
-      ++ItTagHT;
+   gdcmAssertMacro (ItTagHT != TagHT.end());
 
-      return(tmp);
-   }
-   else
-   {
-      return(NULL);
-   }
+   ++ItTagHT;
+   if (ItTagHT != TagHT.end())
+      return  ItTagHT->second;
+   return NULL;
 }
 
 //-----------------------------------------------------------------------------