Some normalizations :

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index ed092100575b9d36c09ba4755d805ed2bec35c73..d5683fdf6ea9194fe6129a980b5acf23ac0f055d 100644 (file)
--- 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/18 12:16:10 $
-  Version:   $Revision: 1.46 $
+  Date:      $Date: 2005/01/23 10:12:34 $
+  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
@@ -50,7 +50,7 @@ SeqEntry::SeqEntry( DictEntry *e )
  * \brief   Constructor from a given SeqEntry
  * @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() )
 {
@@ -78,6 +78,8 @@ SeqEntry::~SeqEntry()
    }
 }
 
+//-----------------------------------------------------------------------------
+// Print
 /**
  * \brief   canonical Printer
  */
@@ -119,6 +121,8 @@ void SeqEntry::Print( std::ostream &os, std::string const & )
    }                    
 }
 
+//-----------------------------------------------------------------------------
+// Public
 /*
  * \brief   canonical Writer
  */
@@ -146,23 +150,42 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write(*fp, seq_term_lg);
 }
 
-//-----------------------------------------------------------------------------
-// Public
+/**
+ * \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   adds the passed ITEM to the ITEM chained List for this SeQuence.
-void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
+/**
+ * \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()
 {
-   sqItem->SetSQItemNumber(itemNumber);
-   Items.push_back(sqItem);
+   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 bigger than the total
  *        item number.
  */
-SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
+SQItem *SeqEntry::GetSQItem(int nb)
 {
    if (nb<0)
    {
@@ -178,39 +201,22 @@ SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
          return *cc;
       }
    }
-   return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
+   return *(Items.end());
 }
 
-/**
- * \brief   Get the first entry while visiting the SeqEntry
- * \return  The first SQItem if found, otherwhise NULL
- */ 
-SQItem *SeqEntry::GetFirstEntry()
+/// \brief retuens the number of SQItems within the current Sequence
+unsigned int SeqEntry::GetNumberOfSQItems()
 {
-   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
- */
+   return Items.size();
+}
 
-SQItem *SeqEntry::GetNextEntry()
+/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
+void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber)
 {
-   gdcmAssertMacro (ItSQItem != Items.end())
-   {
-      ++ItSQItem;
-      if (ItSQItem != Items.end())
-         return *ItSQItem;
-   }
-   return NULL;
+   sqItem->SetSQItemNumber(itemNumber);
+   Items.push_back(sqItem);
 }
- 
+
 //-----------------------------------------------------------------------------
 // Protected