X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=2129c837e487109a4b2cfce69e5f91a99886ebfd;hb=0416947420d9168401c99e7fbf0dca0a081c9175;hp=a31ca8d20cde80603443e5be99c2230010998165;hpb=3b48ae81d6c358b352e726fa283296c496f35437;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index a31ca8d2..2129c837 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2004/06/22 14:03:30 $ - Version: $Revision: 1.10 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.58 $ 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 @@ -22,132 +22,193 @@ #include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmElementSet - * \brief Constructor from a given gdcmElementSet + * \brief Constructor for a given ElementSet */ -gdcmElementSet::gdcmElementSet(int depthLevel) - : gdcmDocEntrySet(depthLevel) { +//BOZ depthLevel is not usefull anymore +ElementSet::ElementSet(int depthLevel) + : DocEntrySet() +{ + (void)depthLevel; } /** - * \ingroup gdcmElementSet * \brief Canonical destructor. */ -gdcmElementSet::~gdcmElementSet() +ElementSet::~ElementSet() { - gdcmDocEntry* EntryToDelete; - for(TagDocEntryHT::iterator cc = tagHT.begin();cc != tagHT.end();++cc) - { - EntryToDelete = cc->second; - if ( EntryToDelete ) - delete EntryToDelete; - } - tagHT.clear(); + ClearEntry(); } - //----------------------------------------------------------------------------- // Public - - -//----------------------------------------------------------------------------- -// Print /** - * \brief Prints the Header Entries (Dicom Elements) + * \brief Writes the Header Entries (Dicom Elements) * from the H Table - * @return + * @param fp ofstream to write to + * @param filetype filetype */ -void gdcmElementSet::Print(std::ostream & os) { - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) +void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) +{ + for (TagDocEntryHT::const_iterator i = TagHT.begin(); + i != TagHT.end(); + ++i) { - //(i)->second->SetPrintLevel(printLevel); - (i->second)->Print(os); + i->second->WriteContent(fp, filetype); } } /** - * \brief Writes the Header Entries (Dicom Elements) - * from the H Table - * @return - */ -void gdcmElementSet::Write(FILE *fp, FileType filetype) { + * \brief add a new Dicom Element pointer to the H Table + * @param newEntry entry to add + */ +bool ElementSet::AddEntry(DocEntry *newEntry) +{ + const TagKey &key = newEntry->GetKey(); -// Troubles expected : BinEntries ARE ValEntries :-( -// BinEntry is checked first, then ValEntry; + if( TagHT.count(key) == 1 ) + { + gdcmWarningMacro( "Key already present: " << key.c_str()); + return false; + } + else + { + TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry)); + return true; + } +} - gdcmDocEntry *e; - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) +/** + * \brief Clear the hash table from given entry AND delete the entry. + * @param entryToRemove Entry to remove AND delete. + */ +bool ElementSet::RemoveEntry( DocEntry *entryToRemove) +{ + const TagKey &key = entryToRemove->GetKey(); + if( TagHT.count(key) == 1 ) { - e=i->second; - e->WriteCommonPart(fp, filetype); - std::cout<GetKey() << " " << std::hex << e->GetVR() << " " - << e->GetName() - << std::endl; - -// e->Write(fp,filetype); // This will be the right way to proceed ! - - if (gdcmBinEntry* BinEntry = dynamic_cast< gdcmBinEntry* >(e) ) { - BinEntry->Write(fp,filetype); - continue; - } - if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) { - ValEntry->Write(fp,filetype); - continue; - } + TagHT.erase(key); + //gdcmWarningMacro( "One element erased."); + delete entryToRemove; + return true; + } - if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(e) ) { - SeqEntry->Write(fp,filetype); - continue; - } - } + gdcmWarningMacro( "Key not present"); + return false ; } -//----------------------------------------------------------------------------- -// Protected -//----------------------------------------------------------------------------- +/** + * \brief Clear the hash table from given entry BUT keep the entry. + * @param entryToRemove Entry to remove. + */ +bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) +{ + const TagKey &key = entryToRemove->GetKey(); + if( TagHT.count(key) == 1 ) + { + TagHT.erase(key); + //gdcmWarningMacro( "One element erased."); + return true; + } -//----------------------------------------------------------------------------- -// Private + gdcmWarningMacro( "Key not present"); + 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 add a new Dicom Element pointer to the H Table - * @param NewEntry entry to add + * \brief Get the first entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) + * \return The first DocEntry if found, otherwhise NULL */ -bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) { - TagKey key; - key = NewEntry->GetKey(); +DocEntry *ElementSet::GetFirstEntry() +{ + ItTagHT = TagHT.begin(); + if (ItTagHT != TagHT.end()) + return ItTagHT->second; + return NULL; +} - if(tagHT.count(key) == 1) - { - dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ", - key.c_str()); - return(false); - } - else - { - tagHT[NewEntry->GetKey()] = NewEntry; - return(true); - } +/** + * \brief Get the next entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) + * \note : meaningfull only if GetFirstEntry already called + * \return The next DocEntry if found, otherwhise NULL + */ +DocEntry *ElementSet::GetNextEntry() +{ + gdcmAssertMacro (ItTagHT != TagHT.end()); + + ++ItTagHT; + if (ItTagHT != TagHT.end()) + return ItTagHT->second; + return NULL; } /** - * \brief Clear the hash table from given entry. - * @param EntryToRemove Entry to remove. + * \brief retrieves a Dicom Element using (group, element) + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return */ -bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove) +DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) +{ + TagKey key = DictEntry::TranslateToKey(group, elem); + TagDocEntryHT::iterator it = TagHT.find(key); + + if ( it!=TagHT.end() ) + return it->second; + return NULL; +} + +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// 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 & ) { - TagKey key = EntryToRemove->GetKey(); - if(tagHT.count(key) == 1) + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - tagHT.erase(key); - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased."); - return true; - } + DocEntry *entry = i->second; - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: "); - return(false); + entry->SetPrintLevel(PrintLevel); + entry->Print(os); + + if ( dynamic_cast(entry) ) + { + // Avoid the newline for a sequence: + continue; + } + os << std::endl; + } } + +//----------------------------------------------------------------------------- +} // end namespace gdcm