X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=8f5e4731c6dc33e6745d1c507fbcd904653812a1;hb=8ba6105c39056bba295025f4b46d2cdf24dab792;hp=d5683fdf6ea9194fe6129a980b5acf23ac0f055d;hpb=0ad9dae4659b21bfd5c834c1af724eab4dcdf4f6;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index d5683fdf..8f5e4731 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/23 10:12:34 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2005/08/24 03:42:40 $
+  Version:   $Revision: 1.57 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,6 +18,7 @@
 
 #include "gdcmSeqEntry.h"
 #include "gdcmSQItem.h"
+#include "gdcmValEntry.h"
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
@@ -29,7 +30,6 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -47,7 +47,7 @@ SeqEntry::SeqEntry( DictEntry *e )
 }
 
 /**
- * \brief   Constructor from a given SeqEntry
+ * \brief   Constructor from a given DocEntry
  * @param   e Pointer to existing Doc entry
  * @param   depth depth level of the current Seq entry
  */
@@ -68,63 +68,15 @@ SeqEntry::SeqEntry( DocEntry *e, int depth )
  */
 SeqEntry::~SeqEntry()
 {
-   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
-   {
-      delete *cc;
-   }
-   if (SeqTerm)
-   {
-      delete SeqTerm;
-   }
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   canonical Printer
- */
-void SeqEntry::Print( std::ostream &os, std::string const & )
-{
-   // First, Print the Dicom Element itself.
-   os << "S ";
-   DocEntry::Print(os);
-   os << std::endl;
-
-   if (GetReadLength() == 0)
-      return;
-
-   // Then, Print each SQ Item   
-   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
-   {
-      (*cc)->SetPrintLevel(PrintLevel);
-      (*cc)->Print(os);   
-   }
-
-   // at end, print the sequence terminator item, if any
-   if (DelimitorMode)
-   {
-      for ( int i = 0; i < SQDepthLevel; i++ )
-      {
-         os << "   | " ;
-      }
-      if (SeqTerm != NULL)
-      {
-         SeqTerm->SetPrintLevel(PrintLevel);
-         SeqTerm->Print(os);
-         os << std::endl;
-      } 
-      else 
-      {
-         // fuse
-         gdcmVerboseMacro("  -------- should have a sequence terminator item");
-      }
-   }                    
+   ClearSQItem();
 }
 
 //-----------------------------------------------------------------------------
 // Public
 /*
  * \brief   canonical Writer
+ * @param fp pointer to an already open file
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
 void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
@@ -150,6 +102,38 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write(*fp, seq_term_lg);
 }
 
+/**
+ * \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
+ * @param sqItem SQItem to be pushed back in the SeqEntry
+ * @param itemNumber ordinal number of the SQItem
+ *  \note NOT end-user intendend method !
+ */
+void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber)
+{
+// FIXME : SQItemNumber is supposed to be the ordinal number of the SQItem
+//         within the Sequence.
+//         Either only 'push_back' is allowed, 
+//                and we just have to do something like SeqEntry::lastNb++
+//         Or we can add (or remove) anywhere, and SQItemNumber will be broken
+   sqItem->SetSQItemNumber(itemNumber);
+   Items.push_back(sqItem);
+}
+
+/**
+ * \brief Remove all SQItem.
+ */
+void SeqEntry::ClearSQItem()
+{
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
+   {
+      delete *cc;
+   }
+   if (SeqTerm)
+   {
+      delete SeqTerm;
+   }
+}
+
 /**
  * \brief   Get the first entry while visiting the SeqEntry
  * \return  The first SQItem if found, otherwhise NULL
@@ -182,7 +166,7 @@ SQItem *SeqEntry::GetNextSQItem()
 /**
  * \brief return a pointer to the SQItem referenced by its ordinal number.
  *        Returns the first item when argument is negative.
- *        Returns the last item when argument is bigger than the total
+ *        Returns the  last item when argument is bigger than the total
  *        item number.
  */
 SQItem *SeqEntry::GetSQItem(int nb)
@@ -204,19 +188,14 @@ SQItem *SeqEntry::GetSQItem(int nb)
    return *(Items.end());
 }
 
-/// \brief retuens the number of SQItems within the current Sequence
+/**
+ * \brief returns the number of SQItems within the current Sequence
+ */
 unsigned int SeqEntry::GetNumberOfSQItems()
 {
    return Items.size();
 }
 
-/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
-void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber)
-{
-   sqItem->SetSQItemNumber(itemNumber);
-   Items.push_back(sqItem);
-}
-
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -225,5 +204,49 @@ void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber)
 // Private
 
 //-----------------------------------------------------------------------------
-} // end namespace gdcm
+// Print
+/**
+ * \brief   canonical Printer
+ */
+void SeqEntry::Print( std::ostream &os, std::string const & )
+{
+   // First, Print the Dicom Element itself.
+   os << "S ";
+   DocEntry::Print(os);
+   os << std::endl;
 
+   if (GetReadLength() == 0)
+      return;
+
+   // Then, Print each SQ Item   
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
+   {
+      (*cc)->SetPrintLevel(PrintLevel);
+      (*cc)->Print(os);   
+   }
+
+   // at end, print the sequence terminator item, if any
+   if (DelimitorMode)
+   {
+      int i;
+      for ( i = 0; i < SQDepthLevel; i++ )
+         os << "   | " ;
+      os << " --- "  << std::endl;
+      for ( i = 0; i < SQDepthLevel; i++ )
+         os << "   | " ;
+      if (SeqTerm != NULL)
+      {
+         SeqTerm->SetPrintLevel(PrintLevel);
+         SeqTerm->Print(os);
+         os << std::endl;
+      } 
+      else 
+      {
+         // fuse
+         gdcmWarningMacro("  -------- should have a sequence terminator item");
+      }
+   }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm