X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSeqEntry.h;h=e29f3fef3d23e7adaa1e6c70e428e01eca0b4a2d;hb=8e7d7cb974953d9bc78b905451de7ca72887dc58;hp=3e9c8c8379b2103d30146df5cf44f35f26396237;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h index 3e9c8c83..e29f3fef 100644 --- a/src/gdcmSeqEntry.h +++ b/src/gdcmSeqEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.h,v $ Language: C++ - Date: $Date: 2006/02/16 20:06:15 $ - Version: $Revision: 1.40 $ + Date: $Date: 2007/08/29 15:30:50 $ + Version: $Revision: 1.46 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,14 +16,14 @@ =========================================================================*/ -#ifndef GDCMSQDOCENTRY_H -#define GDCMSQDOCENTRY_H +#ifndef _GDCMSQDOCENTRY_H_ +#define _GDCMSQDOCENTRY_H_ #include "gdcmDocEntry.h" #include -namespace gdcm +namespace GDCM_NAME_SPACE { class SQItem; //----------------------------------------------------------------------------- @@ -43,12 +43,16 @@ class GDCM_EXPORT SeqEntry : public DocEntry public: /// \brief Contructs a SeqEntry with a RefCounter from DictEntry - static SeqEntry *New(DictEntry *e) {return new SeqEntry(e);} + //static SeqEntry *New(DictEntry *e) {return new SeqEntry(e);} /// \brief Contructs a SeqEntry with a RefCounter from DocEntry static SeqEntry *New(DocEntry *d, int depth) {return new SeqEntry(d,depth);} - +/// \brief Constructs a SeqEntry with a RefCounter from elementary values + static SeqEntry *New(uint16_t group,uint16_t elem/*, VRKey const &vr = GDCM_VRUNKNOWN*/) + {return new SeqEntry(group,elem);} + void Print(std::ostream &os = std::cout, std::string const &indent = "" ); - void WriteContent(std::ofstream *fp, FileType filetype); + void WriteContent(std::ofstream *fp, FileType filetype, + bool insideMetaElements, bool insideSequence); uint32_t ComputeFullLength(); void AddSQItem(SQItem *it, int itemNumber); @@ -76,8 +80,9 @@ public: protected: private: - SeqEntry( DictEntry *e); + //SeqEntry( DictEntry *e); SeqEntry( DocEntry *d, int depth ); + SeqEntry( uint16_t group, uint16_t elem ); ~SeqEntry(); // Variables