X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.h;h=f519d7af00ea7fe33199460594c77fefd0913846;hb=baa2037ebb1ea642207f98a099306b3e9fd7d9f4;hp=be8594980047fcd3a6bc0a3bfca7a584ce92508b;hpb=bba6b52311989034cfaca84d1ab1e492d94c1873;p=gdcm.git diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index be859498..f519d7af 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/11/30 16:24:31 $ - Version: $Revision: 1.24 $ + Date: $Date: 2004/12/16 11:37:03 $ + Version: $Revision: 1.27 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -37,7 +37,7 @@ public: SQItem(int depthLevel); ~SQItem(); - void Print(std::ostream &os = std::cout); + virtual void Print(std::ostream &os = std::cout); void WriteContent(std::ofstream *fp, FileType filetype); /// \brief returns the DocEntry chained List for this SQ Item. @@ -45,9 +45,9 @@ public: /// \brief adds the passed DocEntry to the DocEntry chained List for /// this SQ Item. - void AddDocEntry(DocEntry *e) { DocEntries.push_back(e); }; - - virtual bool AddEntry(DocEntry *Entry); // add to the List + bool AddEntry(DocEntry *Entry); // add to the List + bool RemoveEntry(DocEntry *EntryToRemove); + bool RemoveEntryNoDestroy(DocEntry *EntryToRemove); DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element); // FIXME method to write @@ -76,16 +76,20 @@ public: /// Accessor on \ref BaseTagKey. BaseTagKey const & GetBaseTagKey() const { return BaseTagKeyNested; } + void Initialize(); + DocEntry *GetNextEntry(); protected: // Variables that need to be access in subclasses - /// \brief chained list of (Elementary) Doc Entries + /// \brief Chained list of (Elementary) Doc Entries ListDocEntry DocEntries; + /// Chained list iterator, used to visit the TagHT variable + 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; + // TagDocEntryHT *PtagHT; private: @@ -100,10 +104,8 @@ private: /// with this BaseTagKey. BaseTagKey BaseTagKeyNested; - /// \brief SQ Item ordinal number int SQItemNumber; - }; } // end namespace gdcm //-----------------------------------------------------------------------------