* Fix JPR compilation errors on MSVC.Net 2003

[gdcm.git] / src / gdcmSQItem.h

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 9874b61dd9b658f8246feda6ba4bb89a8e37f4b7..ba42f1c0ddaf8447222d203f8846878c37dfbf06 100644 (file)
--- 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/07 08:46:18 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/07/12 17:08:12 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,67 +30,64 @@ class DocEntry;
 
 //-----------------------------------------------------------------------------
 typedef std::list<DocEntry *> ListDocEntry;
+
 //-----------------------------------------------------------------------------
+/**
+ * \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 depthLevel);
    ~SQItem();
 
-   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Print(std::ostream &os = std::cout, std::string const &indent = "" ); 
    void WriteContent(std::ofstream *fp, FileType filetype);
 
-   /// \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();
+   void ClearEntryNoDestroy();
+   void MoveObject(SQItem *source);
   
-   DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element);
-   
-   bool SetEntryByNumber(std::string const &val, uint16_t group, 
-                                                 uint16_t element);
-    
-   std::string GetEntryByNumber(uint16_t group, uint16_t element);
+   DocEntry *GetFirstEntry();
+   DocEntry *GetNextEntry();
+
+   DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
+
+   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; };
 
-   /// Accessor on \ref SQDepthLevel.
-   int GetDepthLevel() { return SQDepthLevel; }
-                                                                                
-   /// Accessor on \ref SQDepthLevel.
-   void SetDepthLevel(int depth) { SQDepthLevel = depth; }
-
-   /// Accessor on \ref BaseTagKey.
-   void SetBaseTagKey( BaseTagKey const &key ) { BaseTagKeyNested = key; }
+   ///  \brief Accessor on \ref SQDepthLevel.
+   int GetDepthLevel() { return SQDepthLevel; }                                                                             
 
-   /// Accessor on \ref BaseTagKey.
-   BaseTagKey const &GetBaseTagKey() const { return BaseTagKeyNested; }
+   ///  \brief Accessor on \ref SQDepthLevel.
+   void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
-   void Initialize();
-   DocEntry *GetNextEntry();
+   // waste time hunting
+   // /  \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
+// 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;
-
+   /// 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.
    ///        \ref SQDepthLevel and its \ref SeqEntry::SQDepthLevel
@@ -98,9 +95,10 @@ private:
    ///        (see \ref Print).
    int SQDepthLevel;
 
-   /// \brief A TagKey of a DocEntry nested in a sequence is prepended
-   ///        with this BaseTagKey.
-   BaseTagKey BaseTagKeyNested;
+   // waste time hunting
+   // / \brief A TagKey of a DocEntry nested in a sequence is prepended
+   // /        with this BaseTagKey.
+   //BaseTagKey BaseTagKeyNested;
 
    /// \brief SQ Item ordinal number 
    int SQItemNumber;