X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=8d4e81c70feeb42fd15e3a1ec4c3590394e2e4d6;hb=544e9b239eea5ec46a1e637a58e9cbe86afdc08a;hp=ef24fa2843dddaa1fbda237288f32dd078b7e986;hpb=0416947420d9168401c99e7fbf0dca0a081c9175;p=gdcm.git

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index ef24fa28..8d4e81c7 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/02/07 08:48:18 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2006/02/16 20:06:15 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,16 +40,18 @@ 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 = "" ); 
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
    void WriteContent(std::ofstream *fp, FileType filetype);
+   uint32_t ComputeFullLength();
 
    bool AddEntry(DocEntry *Entry); // add to the List
    bool RemoveEntry(DocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    void ClearEntry();
   
    DocEntry *GetFirstEntry();
@@ -57,12 +59,12 @@ public:
 
    DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
 
-   bool IsEmpty() { return DocEntries.empty(); };
+   bool IsEmpty() { return DocEntries.empty(); }
 
    /// \brief   returns the ordinal position of a given SQItem
-   int GetSQItemNumber() { return SQItemNumber; };
+   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; }                                                                             
@@ -70,20 +72,17 @@ public:
    ///  \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; }
+   virtual void Copy(DocEntrySet *set);
 
 protected:
+   SQItem(int depthLevel);
+   ~SQItem();
+
 // 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;
   
 private:
    /// \brief Sequences can be nested. This \ref SQDepthLevel represents
@@ -93,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;
 };