X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=a59c4e19d4f41fe8d53fa4403615d13af1b8d685;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=f22b4ae0fe2830fd9d0ca77886101eddb2c0b18a;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index f22b4ae0..a59c4e19 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/07/02 13:55:27 $ - Version: $Revision: 1.15 $ + Date: $Date: 2005/10/27 11:39:34 $ + Version: $Revision: 1.70 $ 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 @@ -18,122 +18,196 @@ #include "gdcmElementSet.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +#include "gdcmDataEntry.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) { +ElementSet::ElementSet() + : DocEntrySet() +{ } /** - * \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) +void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) { - gdcmDocEntry* Entry; - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) - { - Entry = i->second; - Entry->Print(os); - bool PrintEndLine = true; - if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) - { - (void)SeqEntry; //not used - PrintEndLine = false; - } - if (PrintEndLine) - os << std::endl; + for (TagDocEntryHT::const_iterator i = TagHT.begin(); + i != TagHT.end(); + ++i) + { + // depending on the gdcm::Document type + // (gdcm::File; gdcm::DicomDir, (more to come ?) + // some groups *cannot* be present. + // We hereby protect gdcm for writting stupid things + // if they were found in the original document. + if ( !MayIWrite( (i->second)->GetGroup() ) ) + continue; + // Skip 'Group Length' element, since it may be wrong. + // except for Group 0002 + if ( (i->second)->GetElement() == 0x0000 + && (i->second)->GetGroup() != 0x0002 ) + continue; + 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(); - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) + if ( TagHT.count(key) == 1 ) { - i->second->Write(fp, filetype); - } + gdcmWarningMacro( "Key already present: " << key ); + return false; + } + else + { + TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry)); + newEntry->Register(); + return true; + } } -//----------------------------------------------------------------------------- -// Protected -//----------------------------------------------------------------------------- +/** + * \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 ) + { + TagHT.erase(key); + entryToRemove->Unregister(); + return true; + } -//----------------------------------------------------------------------------- -// Private + gdcmWarningMacro( "Key not present : " << key); + return false ; +} /** - * \brief add a new Dicom Element pointer to the H Table - * @param NewEntry entry to add + * \brief delete all entries in the ElementSet */ -bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) { - gdcmTagKey key; - key = NewEntry->GetKey(); - - if(tagHT.count(key) == 1) - { - dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ", - key.c_str()); - return(false); - } - else +void ElementSet::ClearEntry() +{ + for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) { - tagHT[NewEntry->GetKey()] = NewEntry; - return(true); - } + if ( cc->second ) + { + cc->second->Unregister(); + } + } + TagHT.clear(); +} + +/** + * \brief Get the first entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) + * \return The first DocEntry if found, otherwhise NULL + */ +DocEntry *ElementSet::GetFirstEntry() +{ + ItTagHT = TagHT.begin(); + if (ItTagHT != TagHT.end()) + return ItTagHT->second; + return NULL; } /** - * \brief Clear the hash table from given entry. - * @param EntryToRemove Entry to remove. + * \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 */ -bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove) +DocEntry *ElementSet::GetNextEntry() +{ + gdcmAssertMacro (ItTagHT != TagHT.end()); + + ++ItTagHT; + if (ItTagHT != TagHT.end()) + return ItTagHT->second; + return NULL; +} + +/** + * \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 + */ +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 & ) { - gdcmTagKey key = EntryToRemove->GetKey(); - if(tagHT.count(key) == 1) + // Let's change the 'warning value' for Pixel Data, + // to avoid human reader to be confused by 'gdcm::NotLoaded'. + DataEntry *pixelElement = GetDataEntry(0x7fe0,0x0010); + if ( pixelElement != 0 ) { - tagHT.erase(key); - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased."); - return true; + pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA ); } - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: "); - return(false); + 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