X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=b76afb5a9aecd9220c9a206c4fb1ee2c2e227641;hb=3705811f0b24769b2222f7d5ad2b14f8fd932104;hp=8d2b585b353c8a292de99be75385f4a82c834704;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 8d2b585b..b76afb5a 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/12 04:35:47 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2005/11/07 09:46:37 $
+  Version:   $Revision: 1.48 $
                                                                                 
   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 
 {
@@ -33,71 +30,61 @@ class DocEntry;
 
 //-----------------------------------------------------------------------------
 typedef std::list<DocEntry *> ListDocEntry;
+
 //-----------------------------------------------------------------------------
-class GDCM_EXPORT SQItem 
-  : 
-  public DocEntrySet 
+/**
+ * \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:
-   SQItem(int);
-   ~SQItem();
+   gdcmTypeMacro(SQItem);
 
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype);
+public:
+   static SQItem *New(int depthLevel) {return new SQItem(depthLevel);}
 
-   /// \brief   returns the DocEntry chained List for this SQ Item.
-   ListDocEntry &GetDocEntries() { 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 void Print(std::ostream &os = std::cout, std::string const &indent = "" ); 
+   void WriteContent(std::ofstream *fp, FileType filetype);
+   uint32_t ComputeFullLength();
 
-   virtual bool AddEntry(DocEntry *Entry); // add to the List
+   bool AddEntry(DocEntry *Entry); // add to the List
+   bool RemoveEntry(DocEntry *EntryToRemove);
+   void ClearEntry();
+   void MoveObject(SQItem *source);
   
-   DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element);
-   // FIXME method to write
-   //DocEntry *GetDocEntryByName  (std::string Name);
-   
-   bool SetEntryByNumber(std::string val, uint16_t group, uint16_t element);                   
-    
-   virtual std::string GetEntryByNumber(uint16_t group, uint16_t element);
-
-   /// \brief   returns the ordinal position of a given SQItem
-   int GetSQItemNumber() { return SQItemNumber; };
+   DocEntry *GetFirstEntry();
+   DocEntry *GetNextEntry();
 
-   /// \brief   Sets the ordinal position of a given SQItem
-   void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; };
+   DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
 
-   /// Accessor on \ref SQDepthLevel.
-   int GetDepthLevel() { return SQDepthLevel; }
-                                                                                
-   /// Accessor on \ref SQDepthLevel.
-   void SetDepthLevel(int depth) { SQDepthLevel = depth; }
+   bool IsEmpty() { return DocEntries.empty(); }
 
-   /// Accessor on \ref BaseTagKey.
-   void           SetBaseTagKey( BaseTagKey key ) { BaseTagKeyNested = key; }
+   /// \brief   returns the ordinal position of a given SQItem
+   int GetSQItemNumber() { return SQItemNumber; }
+   /// \brief   Sets the ordinal position of a given SQItem
+   void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; }
 
-   /// Accessor on \ref BaseTagKey.
-   BaseTagKey GetBaseTagKey( ) { return BaseTagKeyNested; }
+   ///  \brief Accessor on \ref SQDepthLevel.
+   int GetDepthLevel() { return SQDepthLevel; }                                                                             
 
+   ///  \brief Accessor on \ref SQDepthLevel.
+   void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
 protected:
+   SQItem(int depthLevel);
+   ~SQItem();
 
-// Variables
-
-   /// \brief chained list of (Elementary) Doc Entries
-   ListDocEntry docEntries;
+// Variables that need to be accessed in subclasses
+   /// \brief Chained list of Doc Entries
+   ListDocEntry DocEntries;
+   /// Iterator, used to visit the entries
+   ListDocEntry::iterator ItDocEntries;
+   /// Iterator, used to visit the Val Entries (for Python users)
+   ListDocEntry::iterator ItValEntries;
   
-   /// \brief SQ Item ordinal number 
-   int SQItemNumber;
-
-   ///\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 SeqEntry::SQDepthLevel
@@ -105,10 +92,8 @@ private:
    ///        (see \ref Print).
    int SQDepthLevel;
 
-   /// \brief A TagKey of a DocEntry nested in a sequence is prepended
-   ///        with this BaseTagKey.
-   BaseTagKey BaseTagKeyNested;
-
+   /// \brief SQ Item ordinal number 
+   int SQItemNumber;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------