X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.h;h=6676c754abb40bafe4f26058a35c207aaad8cb1e;hb=bd2c6b9f9fa4b815153b200081de0450429a882e;hp=29381b401d1f033a60bba83867e55338b3b0f4f2;hpb=0fc486652e88490f7344439111750eb9dcaf7a29;p=gdcm.git

diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h
index 29381b40..6676c754 100644
--- a/src/gdcmSeqEntry.h
+++ b/src/gdcmSeqEntry.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/16 19:21:57 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/01/20 11:26:18 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -19,63 +19,78 @@
 #ifndef GDCMSQDOCENTRY_H
 #define GDCMSQDOCENTRY_H
 
-#include <list>
-
-#include "gdcmSQItem.h"
 #include "gdcmDocEntry.h"
 
+#include <list>
+
+namespace gdcm 
+{
+class SQItem;
 //-----------------------------------------------------------------------------
-typedef std::list<gdcmSQItem *> ListSQItem;
+typedef std::list<SQItem *> ListSQItem;
 //-----------------------------------------------------------------------------
-
-class GDCM_EXPORT gdcmSeqEntry : public gdcmDocEntry 
+/**
+ * \brief a SeqEntry (as opposed to a ValEntry) is a non elementary DocEntry.
+ *        It is composed by a set of SQItems.
+ *        Each SQItem is composed by a set of DocEntry
+ *        A DocEntry may be a SeqEntry
+ *        ... and so forth 
+ */ 
+class GDCM_EXPORT SeqEntry : public DocEntry 
 {
 public:
-   gdcmSeqEntry( gdcmDictEntry* );
-   gdcmSeqEntry(gdcmDocEntry* d,  int depth);
-   virtual ~gdcmSeqEntry();
+   SeqEntry( DictEntry *e);
+   SeqEntry( DocEntry *d, int depth );
+   ~SeqEntry();
    
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
+   void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// returns the SQITEM chained List for this SeQuence.
-   ListSQItem &GetSQItems() { return items; }
+   //ListSQItem const &GetSQItems() const { return Items; }
+   SQItem *GetFirstSQItem();
+   SQItem *GetNextSQItem();
+   SQItem *GetSQItem(int itemNumber);
+   unsigned int GetNumberOfSQItems();
       
    /// Sets the delimitor mode
-   void SetDelimitorMode(bool dm) { delimitor_mode = dm;}
+   void SetDelimitorMode(bool dm) { DelimitorMode = dm; }
 
    /// Sets the Sequence Delimitation Item
-   void SetSequenceDelimitationItem(gdcmDocEntry * e) { seq_term = e;}
+   void SetDelimitationItem(DocEntry *e) { SeqTerm = e;}
+   DocEntry *GetDelimitationItem()       { return SeqTerm;}
 
-   void AddEntry(gdcmSQItem *it, int itemNumber);
-   gdcmSQItem *GetSQItemByOrdinalNumber(int itemNumber);
+   void AddSQItem(SQItem *it, int itemNumber);
 
    /// Gets the depth level
-   int GetDepthLevel() { return SQDepthLevel; }
-                                                                                
+   int GetDepthLevel() const { return SQDepthLevel; }
+
    /// Sets the depth level of a Sequence Entry embedded in a SeQuence
    void SetDepthLevel(int depth) { SQDepthLevel = depth; }
+
 protected:
 
 private:
 // Variables
 
    /// If this Sequence is in delimitor mode (length =0xffffffff) or not
-   bool delimitor_mode;
+   bool DelimitorMode;
    
    /// Chained list of SQ Items
-   ListSQItem items;
-   
+   ListSQItem Items;
+   /// iterator on the SQItems of the current SeqEntry
+   ListSQItem::iterator ItSQItem;
+
    /// sequence terminator item 
-   gdcmDocEntry *seq_term;
+   DocEntry *SeqTerm;
 
-   /// \brief Defines the depth level of this \ref gdcmSeqEntry inside
+   /// \brief Defines the depth level of this \ref SeqEntry inside
    ///        the (optionaly) nested sequences. \ref SQDepthLevel
-   ///        and its \ref gdcmSQItem::SQDepthLevel counterpart
+   ///        and its \ref SQItem::SQDepthLevel counterpart
    ///        are only defined on printing purposes (see \ref Print).
    int SQDepthLevel;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif