X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=a59c4e19d4f41fe8d53fa4403615d13af1b8d685;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=f419aed920cb10b58b2738a4ccf1c2dee929d59e;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index f419aed9..a59c4e19 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/24 16:10:52 $ - Version: $Revision: 1.49 $ + 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 @@ -18,23 +18,19 @@ #include "gdcmElementSet.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +#include "gdcmDataEntry.h" namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** * \brief Constructor for a given ElementSet */ -//BOZ depthLevel is not usefull anymore -ElementSet::ElementSet(int depthLevel) - : DocEntrySet() +ElementSet::ElementSet() + : DocEntrySet() { - (void)depthLevel; } /** @@ -42,39 +38,7 @@ ElementSet::ElementSet(int depthLevel) */ ElementSet::~ElementSet() { - for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) - { - if ( cc->second ) - { - delete cc->second; - } - } - TagHT.clear(); -} - -//----------------------------------------------------------------------------- -// 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; - } + ClearEntry(); } //----------------------------------------------------------------------------- @@ -90,137 +54,23 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) - { - i->second->WriteContent(fp, filetype); + { + // 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 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); - if ( !TagHT.count(key)) - { - return NULL; - } - return TagHT.find(key)->second; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * ValEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding ValEntry. - */ -ValEntry *ElementSet::GetValEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( ValEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound ValEntry."); - - return 0; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * BinEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding BinEntry. - */ -BinEntry *ElementSet::GetBinEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( BinEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound BinEntry."); - - return 0; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * SeqEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding SeqEntry. - */ -SeqEntry *ElementSet::GetSeqEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( SeqEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound SeqEntry."); - - return 0; -} - - -//----------------------------------------------------------------------------- -// Protected - -/** - * \brief Checks if a given Dicom Element exists within the H table - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return true is found - */ -bool ElementSet::CheckIfEntryExist(uint16_t group, uint16_t elem ) -{ - const std::string &key = DictEntry::TranslateToKey(group, elem ); - return TagHT.count(key) != 0; -} - -/** - * \brief Get the (std::string representable) value of the Dicom entry - * @param group Group number of the searched tag. - * @param elem Element number of the searched tag. - * @return Corresponding element value when it exists, - * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. - */ -std::string ElementSet::GetEntryValue(uint16_t group, uint16_t elem) -{ - TagKey key = DictEntry::TranslateToKey(group, elem); - if ( !TagHT.count(key)) - { - return GDCM_UNFOUND; - } - - return ((ValEntry *)TagHT.find(key)->second)->GetValue(); -} - - -//----------------------------------------------------------------------------- -// Private - /** * \brief add a new Dicom Element pointer to the H Table * @param newEntry entry to add @@ -229,14 +79,15 @@ bool ElementSet::AddEntry(DocEntry *newEntry) { const TagKey &key = newEntry->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { - gdcmVerboseMacro( "Key already present: " << key.c_str()); + gdcmWarningMacro( "Key already present: " << key ); return false; } else { TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry)); + newEntry->Register(); return true; } } @@ -248,38 +99,35 @@ bool ElementSet::AddEntry(DocEntry *newEntry) bool ElementSet::RemoveEntry( DocEntry *entryToRemove) { const TagKey &key = entryToRemove->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { TagHT.erase(key); - //gdcmVerboseMacro( "One element erased."); - delete entryToRemove; + entryToRemove->Unregister(); return true; } - gdcmVerboseMacro( "Key not present"); + gdcmWarningMacro( "Key not present : " << key); return false ; } /** - * \brief Clear the hash table from given entry BUT keep the entry. - * @param entryToRemove Entry to remove. + * \brief delete all entries in the ElementSet */ -bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) +void ElementSet::ClearEntry() { - const TagKey &key = entryToRemove->GetKey(); - if( TagHT.count(key) == 1 ) + for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) { - TagHT.erase(key); - //gdcmVerboseMacro( "One element erased."); - return true; + if ( cc->second ) + { + cc->second->Unregister(); + } } - - gdcmVerboseMacro( "Key not present"); - return false ; + TagHT.clear(); } /** - * \brief Get the first entry while visiting the DocEntrySet + * \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() @@ -291,7 +139,8 @@ DocEntry *ElementSet::GetFirstEntry() } /** - * \brief Get the next entry while visiting the Hash table (TagHT) + * \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 */ @@ -305,34 +154,60 @@ DocEntry *ElementSet::GetNextEntry() return NULL; } - /** - * \brief Get the larst entry while visiting the DocEntrySet - * \return The last DocEntry if found, otherwhise 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::GetLastEntry() +DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) { - ItTagHT = TagHT.end(); - if ( ItTagHT != TagHT.begin() ) - return ItTagHT->second; + 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 Get the previous entry while visiting the Hash table (TagHT) - * \note : meaningfull only if GetFirstEntry already called - * \return The previous DocEntry if found, otherwhise NULL - */ -DocEntry *ElementSet::GetPreviousEntry() + * \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 & ) { - gdcmAssertMacro (ItTagHT != TagHT.begin()); + // 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 ) + { + pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA ); + } - --ItTagHT; - if (ItTagHT != TagHT.begin()) - return ItTagHT->second; - return NULL; -} + 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