X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=0d8852258e9471ff5481c4fb87a026312dadb440;hb=4297b237d3010e089a89e0242d4151168553778f;hp=88e1717f2c5574d67adc60a1cb9f32c9c01130f4;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 88e1717f..0d885225 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/02 16:18:49 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/10/25 14:52:35 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,29 +40,30 @@ 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);
 
    bool AddEntry(DocEntry *Entry); // add to the List
    bool RemoveEntry(DocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    void ClearEntry();
+   void MoveObject(SQItem *source);
   
    DocEntry *GetFirstEntry();
    DocEntry *GetNextEntry();
 
    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,19 +71,18 @@ 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; }
-
 protected:
-// Variables that need to be access in subclasses
-   /// \brief Chained list of (Elementary) Doc Entries
+   SQItem(int depthLevel);
+   ~SQItem();
+
+// 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;
-   
+   /// Iterator, used to visit the Val Entries (for Python users)
+   ListDocEntry::iterator ItValEntries;
+  
 private:
    /// \brief Sequences can be nested. This \ref SQDepthLevel represents
    ///        the level of the nesting of instances of this class.
@@ -91,10 +91,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;
 };