X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=58d5e86f1424217294742826d0cb86936c00a9d2;hb=1bd9d6e051a3c49a8e57aa760d1aa83e0f1fe310;hp=fe4d0902a6bdb75af9700c8ed4d3435c937680e2;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index fe4d0902..58d5e86f 100644
--- a/src/gdcmSQItem.h
+++ b/src/gdcmSQItem.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/27 08:39:07 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/01/11 15:15:38 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,42 +18,49 @@
 #ifndef GDCMSQITEM_H
 #define GDCMSQITEM_H
 
-#include <list>
-#include "gdcmDocEntry.h"
 #include "gdcmDocEntrySet.h"
-#include "gdcmDocument.h"
+#include "gdcmElementSet.h"
 
+#include <list>
+#include <fstream>
 
-class gdcmBinEntry;
+namespace gdcm 
+{
+class DocEntry;
 
 //-----------------------------------------------------------------------------
-typedef std::list<gdcmDocEntry *> ListDocEntry;
+typedef std::list<DocEntry *> ListDocEntry;
 //-----------------------------------------------------------------------------
-class GDCM_EXPORT gdcmSQItem : public gdcmDocEntrySet
+/**
+ * \brief a SeqEntry 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 SQItem : public DocEntrySet 
 {
 public:
-   gdcmSQItem(int);
-   ~gdcmSQItem();
+   SQItem(int depthLevel);
+   ~SQItem();
 
    virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype);
+   void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// \brief   returns the DocEntry chained List for this SQ Item.
-   ListDocEntry &GetDocEntries() { return docEntries; };
+   ListDocEntry const &GetDocEntries() const { return DocEntries; };
    
    /// \brief   adds the passed DocEntry to the DocEntry chained List for
    /// this SQ Item.      
-   void AddDocEntry(gdcmDocEntry *e) { docEntries.push_back(e); };
-
-   virtual bool AddEntry(gdcmDocEntry *Entry); // add to the List
+   bool AddEntry(DocEntry *Entry); // add to the List
+   bool RemoveEntry(DocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
   
-   gdcmDocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element);
-   // FIXME method to write
-   //gdcmDocEntry *GetDocEntryByName  (std::string Name);
+   DocEntry *GetDocEntry(uint16_t group, uint16_t element);
    
-   bool SetEntryByNumber(std::string val, uint16_t group, uint16_t element);                   
+   bool SetEntry(std::string const &val, uint16_t group, 
+                                         uint16_t element);
     
-   virtual std::string GetEntryByNumber(uint16_t group, uint16_t element);
+   std::string GetEntry(uint16_t group, uint16_t element);
 
    /// \brief   returns the ordinal position of a given SQItem
    int GetSQItemNumber() { return SQItemNumber; };
@@ -61,48 +68,49 @@ public:
    /// \brief   Sets the ordinal position of a given SQItem
    void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; };
 
-   /// Accessor on \ref SQDepthLevel.
+   ///  \brief Accessor on \ref SQDepthLevel.
    int GetDepthLevel() { return SQDepthLevel; }
                                                                                 
-   /// Accessor on \ref SQDepthLevel.
+   ///  \brief Accessor on \ref SQDepthLevel.
    void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
-   /// Accessor on \ref BaseTagKey.
-   void           SetBaseTagKey( gdcmBaseTagKey key ) { BaseTagKey = key; }
+   ///  \brief Accessor on \ref BaseTagKey.
+   void SetBaseTagKey( BaseTagKey const &key ) { BaseTagKeyNested = key; }
 
-   /// Accessor on \ref BaseTagKey.
-   gdcmBaseTagKey GetBaseTagKey( ) { return BaseTagKey; }
+   ///  \brief Accessor on \ref BaseTagKey.
+   BaseTagKey const &GetBaseTagKey() const { return BaseTagKeyNested; }
 
+   void Initialize();
+   DocEntry *GetNextEntry();
 
 protected:
+// Variables that need to be access in subclasses
 
-// Variables
-
-   /// \brief chained list of (Elementary) Doc Entries
-   ListDocEntry docEntries;
-  
-   /// \brief SQ Item ordinal number 
-   int SQItemNumber;
-
-   ///\brief pointer to the HTable of the gdcmDocument,
-   ///       (because we don't know it within any gdcmDicomDirObject nor any gdcmSQItem)
-   TagDocEntryHT *PtagHT;
+   /// \brief Chained list of (Elementary) Doc Entries
+   ListDocEntry DocEntries;
+   /// Chained list iterator, used to visit the TagHT variable
+   ListDocEntry::iterator ItDocEntries;
+   
+   /// \brief pointer to the HTable of the Document,
+   ///       (because we don't know it within any DicomDirObject nor any SQItem)
+   // TagDocEntryHT *PtagHT;
 
-       
 private:
 
    /// \brief Sequences can be nested. This \ref SQDepthLevel represents
    ///        the level of the nesting of instances of this class.
-   ///        \ref SQDepthLevel and its \ref gdcmSeqEntry::SQDepthLevel
+   ///        \ref SQDepthLevel and its \ref SeqEntry::SQDepthLevel
    ///        counterpart are only defined on printing purposes
    ///        (see \ref Print).
    int SQDepthLevel;
 
-   /// \brief A TagKey of a gdcmDocEntry nested in a sequence is prepended
+   /// \brief A TagKey of a DocEntry nested in a sequence is prepended
    ///        with this BaseTagKey.
-   gdcmBaseTagKey BaseTagKey;
+   BaseTagKey BaseTagKeyNested;
 
+   /// \brief SQ Item ordinal number 
+   int SQItemNumber;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif