X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=1330a42f3f80195c40f52e2a8213c3367bb0329f;hb=8e10ae94ea66aca5adf40e66521fba9c736628c4;hp=dbf05c6065215f64dcf39c1dadd5bc4f271ede86;hpb=ce8913daafe02955368fd2f07e777e86824467cc;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index dbf05c60..1330a42f 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/01/25 15:44:24 $ - Version: $Revision: 1.51 $ + Date: $Date: 2005/02/02 16:18:48 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,7 +24,6 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -45,31 +44,6 @@ ElementSet::~ElementSet() ClearEntry(); } -//----------------------------------------------------------------------------- -// Print -/** - * \brief Prints the Header Entries (Dicom Elements) from the H Table - * @param os ostream to write to - * @param indent Indentation string to be prepended during printing - */ -void ElementSet::Print(std::ostream &os, std::string const & ) -{ - for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) - { - DocEntry* entry = i->second; - - entry->SetPrintLevel(PrintLevel); - entry->Print(os); - - if ( dynamic_cast(entry) ) - { - // Avoid the newline for a sequence: - continue; - } - os << std::endl; - } -} - //----------------------------------------------------------------------------- // Public /** @@ -88,21 +62,6 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) } } -/** - * \brief delete all entries in the ElementSet - */ -void ElementSet::ClearEntry() -{ - for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) - { - if ( cc->second ) - { - delete cc->second; - } - } - TagHT.clear(); -} - /** * \brief add a new Dicom Element pointer to the H Table * @param newEntry entry to add @@ -160,6 +119,21 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) return false ; } +/** + * \brief delete all entries in the ElementSet + */ +void ElementSet::ClearEntry() +{ + for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) + { + if ( cc->second ) + { + delete cc->second; + } + } + TagHT.clear(); +} + /** * \brief Get the first entry while visiting the DocEntrySet * \return The first DocEntry if found, otherwhise NULL @@ -209,5 +183,30 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) //----------------------------------------------------------------------------- // Private +//----------------------------------------------------------------------------- +// Print +/** + * \brief Prints the Header Entries (Dicom Elements) from the H Table + * @param os ostream to write to + * @param indent Indentation string to be prepended during printing + */ +void ElementSet::Print(std::ostream &os, std::string const & ) +{ + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) + { + DocEntry* entry = i->second; + + entry->SetPrintLevel(PrintLevel); + entry->Print(os); + + if ( dynamic_cast(entry) ) + { + // Avoid the newline for a sequence: + continue; + } + os << std::endl; + } +} + //----------------------------------------------------------------------------- } // end namespace gdcm