X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=c1da9457d10441695996b84172e2d9ab9b02dccf;hb=a0fbf995c51ba9e31cca7f14ba1deffdf188f3b9;hp=985adfdc2082eb9f48551f4906bed23b3660ade8;hpb=3c51b39e18ba55faf14c5bbac129662e824d3adb;p=gdcm.git diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h index 985adfdc..c1da9457 100644 --- a/src/gdcmElementSet.h +++ b/src/gdcmElementSet.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.h,v $ Language: C++ - Date: $Date: 2004/09/03 04:16:29 $ - Version: $Revision: 1.12 $ + Date: $Date: 2004/10/25 04:47:43 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -19,44 +19,50 @@ #ifndef GDCMELEMENTSET_H #define GDCMELEMENTSET_H -#include -#include #include "gdcmCommon.h" #include "gdcmDocEntrySet.h" +#include +#include -class gdcmValEntry; -class gdcmBinEntry; -class gdcmSeqEntry; - +class ValEntry; +class BinEntry; +class SeqEntry; -typedef std::map TagDocEntryHT; +namespace gdcm +{ +typedef std::map TagDocEntryHT; //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet +class GDCM_EXPORT ElementSet : public DocEntrySet { public: - gdcmElementSet(int); - ~gdcmElementSet(); - virtual bool AddEntry(gdcmDocEntry *Entry); - virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove); - - virtual void Print(std::ostream &os = std::cout); - virtual void Write(FILE *fp, FileType filetype); + ElementSet(int); + ~ElementSet(); - /// Accessor to \ref gdcmElementSet::tagHT - // Do not expose this to user (public API) ! - TagDocEntryHT &GetEntry() { return TagHT; }; + bool AddEntry(DocEntry *Entry); + bool RemoveEntry(DocEntry *EntryToRemove); + bool RemoveEntryNoDestroy(DocEntry *EntryToRemove); + + void Print(std::ostream &os = std::cout); + void Write(std::ofstream *fp, FileType filetype); + + /// Accessor to \ref TagHT + // Do not expose this to user (public API) ! + // A test is using it thus put it in public (matt) + TagDocEntryHT const & GetTagHT() const { return TagHT; }; protected: + +private: // Variables /// Hash Table (map), to provide fast access TagDocEntryHT TagHT; - -private: - //friend class gdcmDicomDir; + + friend class Document; + friend class DicomDir; //For accessing private TagHT }; - +} // end namespace gdcm //----------------------------------------------------------------------------- #endif