X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=ba147753d0cf48bcaa75d01e61a2ac6f8c24369b;hb=ef0e08814ac95a5412e8650112e23add221767d1;hp=e7c230ac00f0d029061a3c019847d191d0662f16;hpb=b21d001c8abe8aec991946adfd4c899500122304;p=gdcm.git

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index e7c230ac..ba147753 100644
--- a/src/gdcmSQItem.h
+++ b/src/gdcmSQItem.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 11:39:49 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#ifndef GDCMSQITEM_H
-#define GDCMSQITEM_H
+#ifndef _GDCMSQITEM_H_
+#define _GDCMSQITEM_H_
 
 #include "gdcmDocEntrySet.h"
 #include "gdcmElementSet.h"
@@ -24,12 +24,13 @@
 #include <list>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 class DocEntry;
 
 //-----------------------------------------------------------------------------
 typedef std::list<DocEntry *> ListDocEntry;
+
 //-----------------------------------------------------------------------------
 /**
  * \brief a SeqEntry is composed by a set of SQItems.
@@ -39,67 +40,51 @@ typedef std::list<DocEntry *> ListDocEntry;
  */ 
 class GDCM_EXPORT SQItem : public DocEntrySet 
 {
+   gdcmTypeMacro(SQItem);
+
 public:
-   SQItem(int depthLevel);
-   ~SQItem();
+   static SQItem *New(int depthLevel) {return new SQItem(depthLevel);}
 
-   virtual void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
-   void WriteContent(std::ofstream *fp, FileType filetype);
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
+   void WriteContent(std::ofstream *fp, FileType filetype, bool insideMetaElements);
+   uint32_t ComputeFullLength();
 
-   /// \brief   returns the DocEntry chained List for this SQ Item.
-   ListDocEntry const &GetDocEntries() const { return DocEntries; };
-   
-   /// \brief   adds the passed DocEntry to the DocEntry chained List for
-   /// this SQ Item.      
    bool AddEntry(DocEntry *Entry); // add to the List
    bool RemoveEntry(DocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
+   void ClearEntry();
   
+   DocEntry *GetFirstEntry();
+   DocEntry *GetNextEntry();
+
    DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
-   ValEntry *GetValEntry(uint16_t group, uint16_t elem); 
-   BinEntry *GetBinEntry(uint16_t group, uint16_t elem); 
-   SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem); 
-   
-   bool SetEntry(std::string const &val, uint16_t group, 
-                                         uint16_t elem);
-    
-   std::string GetEntry(uint16_t group, uint16_t elem);
 
-   /// \brief   returns the ordinal position of a given SQItem
-   int GetSQItemNumber() { return SQItemNumber; };
+   bool IsEmpty() { return DocEntries.empty(); }
 
+   /// \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; };
+   void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; }
 
    ///  \brief Accessor on \ref SQDepthLevel.
-   int GetDepthLevel() { return SQDepthLevel; }
-                                                                                
+   int GetDepthLevel() { return SQDepthLevel; }                                                                             
+
    ///  \brief Accessor on \ref SQDepthLevel.
    void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
-   ///  \brief Accessor on \ref BaseTagKey.
-   void SetBaseTagKey( BaseTagKey const &key ) { BaseTagKeyNested = key; }
-
-   ///  \brief Accessor on \ref BaseTagKey.
-   BaseTagKey const &GetBaseTagKey() const { return BaseTagKeyNested; }
-
-   DocEntry *GetFirstEntry();
-   DocEntry *GetNextEntry();
+   virtual void Copy(DocEntrySet *set);
 
 protected:
-// Variables that need to be access in subclasses
+   SQItem(int depthLevel);
+   ~SQItem();
 
-   /// \brief Chained list of (Elementary) Doc Entries
+// Variables that need to be accessed in subclasses
+   /// \brief Chained list of Doc Entries
    ListDocEntry DocEntries;
-   /// Chained list iterator, used to visit the TagHT variable
+   /// Iterator, used to visit the entries
    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 SeqEntry::SQDepthLevel
@@ -107,10 +92,6 @@ 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;
 };