X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSQItem.cxx;h=9babd77f5ff34fde840ed5b022c0606722036fa7;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=a9c1ed5efcc8fb523f3ab91c2a16ffeb9b8ac918;hpb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index a9c1ed5e..9babd77f 100644
--- 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/03 20:16:58 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/01/06 20:03:28 $
+  Version:   $Revision: 1.45 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,9 +60,8 @@ SQItem::~SQItem()
 /*
  * \brief   canonical Printer
  */
- void SQItem::Print(std::ostream& os)
- {
-   os << "S ";
+void SQItem::Print(std::ostream &os)
+{
    std::ostringstream s;
 
    if (SQDepthLevel > 0)
@@ -77,13 +76,13 @@ SQItem::~SQItem()
                                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;
@@ -99,7 +98,7 @@ SQItem::~SQItem()
  * \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 };
@@ -148,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
@@ -168,7 +167,7 @@ bool SQItem::AddEntry(DocEntry* entry)
  * @return  true if element was found or created successfully
  */
 
-bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, 
+bool SQItem::SetEntryByNumber(std::string const &val, uint16_t group, 
                               uint16_t element)
 {
    for(ListDocEntry::iterator i = DocEntries.begin(); 
@@ -180,7 +179,7 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
          continue;
       }
 
-      if (  ( group   < (*i)->GetGroup() )
+      if (  ( group  < (*i)->GetGroup() )
           ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) )
       {
          // instead of ReplaceOrCreateByNumber 
@@ -188,41 +187,23 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
          ValEntry* entry = 0;
          TagKey key = DictEntry::TranslateToKey(group, element);
 
-         if ( ! PtagHT->count(key))
-         {
-            // 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);
-            if (dictEntry == NULL)
-            {
-               dictEntry = 
-                  Global::GetDicts()->NewVirtualDictEntry(group, element,
-                                                          "UN", "??", "??");
-            } 
-            // we assume the constructor didn't fail
-            entry = new ValEntry(dictEntry);
-            /// \todo
-            /// ----
-            /// better we don't assume too much !
-            /// SQItem is now used to describe any DICOMDIR related object
-         }
-         else
+         // 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);
+         if (dictEntry == NULL)
          {
-            DocEntry* foundEntry = PtagHT->find(key)->second;
-            entry = dynamic_cast<ValEntry*>(foundEntry);
-            if (!entry)
-            {
-               dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries"
-                              " contains non ValEntry occurences");
-            }
-         }
+            dictEntry = 
+               Global::GetDicts()->NewVirtualDictEntry(group, element,
+                                                       "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;
@@ -233,7 +214,6 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
          {
             entry->SetValue(val);
          }
-         (*i)->SetLength(val.length()); 
          return true;    
       }
    }