X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=df11a3456d5f5ad5bc999c8229c7c20bc369e542;hb=7059f7f1ad9d1466d7b752a40cfeb95ba81aa3d8;hp=0f42e54b1d717ad097285e3ac99d335d2013be49;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 0f42e54b..df11a345 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/10/22 03:05:42 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/08 15:04:00 $
+  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
@@ -21,11 +21,8 @@
 #include "gdcmDocEntrySet.h"
 #include "gdcmElementSet.h"
 
-//#include "gdcmDocEntry.h"
-//#include "gdcmDocument.h"
-//#include "gdcmBinEntry.h"
-
 #include <list>
+#include <fstream>
 
 namespace gdcm 
 {
@@ -34,33 +31,30 @@ class DocEntry;
 //-----------------------------------------------------------------------------
 typedef std::list<DocEntry *> ListDocEntry;
 //-----------------------------------------------------------------------------
-class GDCM_EXPORT SQItem 
-  : 
-  public DocEntrySet 
+class GDCM_EXPORT SQItem : public DocEntrySet 
 {
 public:
-   SQItem(int);
+   SQItem(int depthLevel);
    ~SQItem();
 
    virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(std::ofstream *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(DocEntry *e) { docEntries.push_back(e); };
-
-   virtual bool AddEntry(DocEntry *Entry); // add to the List
+   bool AddEntry(DocEntry *Entry); // add to the List
+   bool RemoveEntry(DocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
   
-   DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element);
-   // FIXME method to write
-   //DocEntry *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; };
@@ -75,27 +69,26 @@ public:
    void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
    /// Accessor on \ref BaseTagKey.
-   void           SetBaseTagKey( BaseTagKey key ) { BaseTagKeyNested = key; }
+   void SetBaseTagKey( BaseTagKey const &key ) { BaseTagKeyNested = key; }
 
    /// Accessor on \ref BaseTagKey.
-   BaseTagKey GetBaseTagKey( ) { return BaseTagKeyNested; }
+   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 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;
+   // TagDocEntryHT *PtagHT;
 
-       
 private:
 
    /// \brief Sequences can be nested. This \ref SQDepthLevel represents
@@ -109,6 +102,8 @@ private:
    ///        with this BaseTagKey.
    BaseTagKey BaseTagKeyNested;
 
+   /// \brief SQ Item ordinal number 
+   int SQItemNumber;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------