X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=4804928cb7ac8173dbbd62a9c069fcccafc5fda3;hb=c2975ffb8c79fa4d745368d8d1c317c5a313dd0a;hp=9b8becbaa52cae97612b83cc87747cfb95be99c6;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 9b8becba..4804928c 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/02/05 01:37:08 $ - Version: $Revision: 1.56 $ + Date: $Date: 2005/11/29 12:48:47 $ + Version: $Revision: 1.71 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,9 +18,8 @@ #include "gdcmElementSet.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +#include "gdcmDataEntry.h" namespace gdcm { @@ -29,11 +28,9 @@ namespace gdcm /** * \brief Constructor for a given ElementSet */ -//BOZ depthLevel is not usefull anymore -ElementSet::ElementSet(int depthLevel) - : DocEntrySet() +ElementSet::ElementSet() + : DocEntrySet() { - (void)depthLevel; } /** @@ -57,8 +54,20 @@ 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); } } @@ -70,14 +79,15 @@ bool ElementSet::AddEntry(DocEntry *newEntry) { const TagKey &key = newEntry->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { - gdcmWarningMacro( "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; } } @@ -89,33 +99,14 @@ 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); - //gdcmWarningMacro( "One element erased."); - delete entryToRemove; + entryToRemove->Unregister(); return true; } - gdcmWarningMacro( "Key not present"); - return false ; -} - -/** - * \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; - } - - gdcmWarningMacro( "Key not present"); + gdcmWarningMacro( "Key not present : " << key); return false ; } @@ -128,7 +119,7 @@ void ElementSet::ClearEntry() { if ( cc->second ) { - delete cc->second; + cc->second->Unregister(); } } TagHT.clear(); @@ -163,45 +154,6 @@ DocEntry *ElementSet::GetNextEntry() return NULL; } -/** - * \brief Get the first ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * This method is designed for Python users - * \return The first ValEntry if found, otherwhise NULL - */ -ValEntry *ElementSet::GetFirstValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = GetFirstEntry(); - // an other iterator is needed to allow user iterate - // at the same time both on DocEntries and ValEntries - ItValEntryTagHT = ItTagHT; - if ( (valEntry = dynamic_cast(d))) - return valEntry; - return GetNextValEntry(); -} - -/** - * \brief Get the next ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * \note : meaningfull only if GetFirstValEntry already called - * \return The next ValEntry if found, otherwhise NULL - */ -ValEntry *ElementSet::GetNextValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = ItValEntryTagHT->second; - ++ItValEntryTagHT; - while( d ) - { - if ( (valEntry = dynamic_cast(d))) - return valEntry; - else - return GetNextValEntry(); - } - return 0; -} - /** * \brief retrieves a Dicom Element using (group, element) * @param group Group number of the searched Dicom Element @@ -218,6 +170,29 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) return NULL; } +/** + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries a not copied, only referenced + */ +void ElementSet::Copy(DocEntrySet *set) +{ + // Remove all previous entries + ClearEntry(); + + DocEntrySet::Copy(set); + + ElementSet *eltSet = dynamic_cast(set); + if( eltSet ) + { + TagHT = eltSet->TagHT; + for(ItTagHT = TagHT.begin();ItTagHT != TagHT.end();++ItTagHT) + { + (ItTagHT->second)->Register(); + } + } +} + //----------------------------------------------------------------------------- // Protected @@ -233,14 +208,22 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) */ void ElementSet::Print(std::ostream &os, std::string const & ) { + // 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 ); + } + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - DocEntry* entry = i->second; + DocEntry *entry = i->second; entry->SetPrintLevel(PrintLevel); entry->Print(os); - if ( dynamic_cast(entry) ) + if ( dynamic_cast(entry) ) { // Avoid the newline for a sequence: continue;