X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=615863efca6b641a4438396a97bb3b5d27d349a4;hb=3842530aeeb5ab67f9d7b0f1754108fd176ee51a;hp=08465ea8dabbbf04a496c308922882faf1584a29;hpb=e8caac199c2683cb0f118c42c61dc6aec85b1eec;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 08465ea8..615863ef 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/16 04:50:42 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/10/25 14:52:35 $
+  Version:   $Revision: 1.60 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 #include <iomanip>
@@ -28,11 +29,9 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup SeqEntry
  * \brief   Constructor from a given SeqEntry
  */
 SeqEntry::SeqEntry( DictEntry *e ) 
@@ -47,10 +46,10 @@ 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
-  */
+ */
 SeqEntry::SeqEntry( DocEntry *e, int depth )
              : DocEntry( e->GetDictEntry() )
 {
@@ -68,59 +67,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;
-   }
-}
-
-/**
- * \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
-         os << "      -------------- 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)
 {
@@ -146,23 +101,75 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write(*fp, seq_term_lg);
 }
 
-//-----------------------------------------------------------------------------
-// Public
-
-/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
-void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
+/**
+ * \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);
+   sqItem->Register();
+}
+
+/**
+ * \brief Remove all SQItem.
+ */
+void SeqEntry::ClearSQItem()
+{
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
+   {
+      (*cc)->Unregister();
+   }
+   if (SeqTerm)
+   {
+      SeqTerm->Unregister();
+   }
 }
 
+/**
+ * \brief   Get the first entry while visiting the SeqEntry
+ * \return  The first SQItem if found, otherwhise NULL
+ */ 
+SQItem *SeqEntry::GetFirstSQItem()
+{
+   ItSQItem = Items.begin();
+   if (ItSQItem != Items.end())
+      return *ItSQItem;
+   return NULL;
+} 
+
+/**
+ * \brief   Get the next SQItem while visiting the SeqEntry
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next SQItem if found, otherwhise NULL
+ */
+
+SQItem *SeqEntry::GetNextSQItem()
+{
+   gdcmAssertMacro (ItSQItem != Items.end())
+   {
+      ++ItSQItem;
+      if (ItSQItem != Items.end())
+         return *ItSQItem;
+   }
+   return NULL;
+}
+ 
 /**
  * \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 bigget than the total
+ *        Returns the  last item when argument is bigger than the total
  *        item number.
  */
-SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
+SQItem *SeqEntry::GetSQItem(int nb)
 {
    if (nb<0)
    {
@@ -178,8 +185,33 @@ SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
          return *cc;
       }
    }
-   return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
+   return *(Items.end());
+}
+
+/**
+ * \brief returns the number of SQItems within the current Sequence
+ */
+unsigned int SeqEntry::GetNumberOfSQItems()
+{
+   return Items.size();
+}
+
+/**
+ * \brief Sets the Sequence Delimitation Item
+ * \param e Delimitation item
+ */
+void SeqEntry::SetDelimitationItem(DocEntry *e)
+{
+   if( SeqTerm != e )
+   {
+      if( SeqTerm )
+         SeqTerm->Unregister();
+      SeqTerm = e;
+      if( SeqTerm )
+         SeqTerm->Register();
+   }
 }
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -188,5 +220,49 @@ SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
 // 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