According to Benoit's suggestion, and without any objection from anybody

[gdcm.git] / src / gdcmSQItem.cxx

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 13af23674f3f1abb09a18b1c306a65f51cf81d86..c6cd59c1150c0ed2c9de5a0a25dbc7152cc49bf1 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/06 11:37:38 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2005/01/08 15:04:00 $
+  Version:   $Revision: 1.49 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,7 +60,7 @@ SQItem::~SQItem()
 /*
  * \brief   canonical Printer
  */
-void SQItem::Print(std::ostream& os)
+void SQItem::Print(std::ostream &os)
 {
    std::ostringstream s;
 
@@ -76,13 +76,13 @@ void SQItem::Print(std::ostream& os)
                                i != DocEntries.end();
                              ++i)
    {
-      DocEntry* Entry = *i;
+      DocEntry *Entry = *i;
       bool PrintEndLine = true;
 
       os << s.str();
-      Entry->SetPrintLevel(2);
+      Entry->SetPrintLevel(PrintLevel);
       Entry->Print(os); 
-      if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(Entry) )
+      if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(Entry) )
       {
          (void)seqEntry;  //not used
          PrintEndLine = false;
@@ -98,7 +98,7 @@ void SQItem::Print(std::ostream& os)
  * \ingroup SQItem
  * \brief   canonical Writer
  */
-void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
 {
    int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
@@ -147,7 +147,7 @@ void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
 /**
  * \brief   adds any Entry (Dicom Element) to the Sequence Item
  */
-bool SQItem::AddEntry(DocEntry* entry)
+bool SQItem::AddEntry(DocEntry *entry)
 {
    DocEntries.push_back(entry);
    //TODO : check if it worked
@@ -163,12 +163,12 @@ bool SQItem::AddEntry(DocEntry* entry)
  *          (NOT a shadow one)       
  * @param   val string value to set
  * @param   group Group number of the searched tag.
- * @param   element Element number of the searched tag.
+ * @param   elem Element number of the searched tag.
  * @return  true if element was found or created successfully
  */
 
-bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, 
-                              uint16_t element)
+bool SQItem::SetEntry(std::string const &val, uint16_t group, 
+                      uint16_t elem)
 {
    for(ListDocEntry::iterator i = DocEntries.begin(); 
                               i != DocEntries.end(); 
@@ -180,43 +180,41 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
       }
 
       if (  ( group  < (*i)->GetGroup() )
-          ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) )
+          ||( group == (*i)->GetGroup() && elem < (*i)->GetElement()) )
       {
-         // instead of ReplaceOrCreateByNumber 
+         // instead of ReplaceOrCreate 
          // that is a method of Document :-( 
          ValEntry* entry = 0;
-         TagKey key = DictEntry::TranslateToKey(group, element);
+         TagKey key = DictEntry::TranslateToKey(group, elem);
 
          // we assume a Public Dictionnary *is* loaded
          Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
          // if the invoked (group,elem) doesn't exist inside the Dictionary
          // we create a VirtualDictEntry
-         DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element);
+         DictEntry *dictEntry = pubDict->GetDictEntry(group, elem);
          if (dictEntry == NULL)
          {
             dictEntry = 
-               Global::GetDicts()->NewVirtualDictEntry(group, element,
-                                                       "UN", "??", "??");
+               Global::GetDicts()->NewVirtualDictEntry(group, elem,
+                                                       "UN", GDCM_UNKNOWN, 
+                                                        GDCM_UNKNOWN);
          } 
          // we assume the constructor didn't fail
          entry = new ValEntry(dictEntry);
-
          if (entry)
          {
             entry->SetValue(val); 
          }
-         entry->SetLength(val.length());
          DocEntries.insert(i,entry);
 
          return true;
       }   
-      if (group == (*i)->GetGroup() && element == (*i)->GetElement() )
+      if (group == (*i)->GetGroup() && elem == (*i)->GetElement() )
       {
          if ( ValEntry* entry = dynamic_cast<ValEntry*>(*i) )
          {
             entry->SetValue(val);
          }
-         (*i)->SetLength(val.length()); 
          return true;    
       }
    }
@@ -238,16 +236,15 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove)
       if( *it == entryToRemove)
       {
          DocEntries.erase(it);
-         dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+         gdcmVerboseMacro( "One element erased.");
          delete entryToRemove;
          return true;
       }
    }
-                                                                                
-   dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+   gdcmVerboseMacro( "Value not present.");
    return false ;
 }
-                                                                                
+
 /**
  * \brief   Clear the hash table from given entry BUT keep the entry.
  * @param   entryToRemove Entry to remove.
@@ -261,12 +258,12 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove)
       if( *it == entryToRemove)
       {
          DocEntries.erase(it);
-         dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+         gdcmVerboseMacro( "One element erased.");
          return true;
       }
    }
                                                                                 
-   dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+   gdcmVerboseMacro( "Value not present.");
    return false ;
 }
                                                                                 
@@ -300,15 +297,17 @@ DocEntry *SQItem::GetNextEntry()
 //-----------------------------------------------------------------------------
 // Protected
 /**
- * \brief   Gets a Dicom Element inside a SQ Item Entry, by number
+ * \brief   Gets a Dicom Element inside a SQ Item Entry
+ * @param   group   Group number of the Entry
+ * @param   elem  Element number of the Entry
  * @return
  */
-DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
+DocEntry* SQItem::GetDocEntry(uint16_t group, uint16_t elem)
 {
    for(ListDocEntry::iterator i = DocEntries.begin();
                               i != DocEntries.end(); ++i)
    {
-      if ( (*i)->GetGroup() == group && (*i)->GetElement() == element )
+      if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem )
       {
          return *i;
       }
@@ -317,16 +316,18 @@ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
 }
 
 /**
- * \brief   Get the value of a Dicom Element inside a SQ Item Entry, by number
+ * \brief   Get the value of a Dicom Element inside a SQ Item Entry
+ * @param   group   Group number of the Entry
+ * @param   elem  Element number of the Entry 
  * @return
  */ 
 
-std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element)
+std::string SQItem::GetEntry(uint16_t group, uint16_t elem)
 {
    for(ListDocEntry::iterator i = DocEntries.begin();
                               i != DocEntries.end(); ++i)
    {
-      if ( (*i)->GetGroup() == group && (*i)->GetElement() == element)
+      if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem)
       {
          return ((ValEntry *)(*i))->GetValue();   //FIXME
       }