X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=f64d2b141bb716bf93655cc6ec4f2392edaf7fd1;hb=58156942f515f7d313b9b098156313a44f3b1e2b;hp=d7c29e5e4e0aa9fee103be946285f5729072a93f;hpb=7476af29bb3b4ef233bb4f284b26322432f07e49;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index d7c29e5e..f64d2b14 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2004/11/04 15:08:50 $ - Version: $Revision: 1.35 $ + Date: $Date: 2005/01/07 22:03:30 $ + Version: $Revision: 1.48 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,8 +21,10 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" #include "gdcmGlobal.h" +#include "gdcmDictSet.h" #include "gdcmUtil.h" #include "gdcmDebug.h" + #include namespace gdcm @@ -58,8 +60,8 @@ SQItem::~SQItem() /* * \brief canonical Printer */ - void SQItem::Print(std::ostream& os) - { +void SQItem::Print(std::ostream &os) +{ std::ostringstream s; if (SQDepthLevel > 0) @@ -74,13 +76,13 @@ SQItem::~SQItem() i != DocEntries.end(); ++i) { - DocEntry* Entry = *i; + DocEntry *Entry = *i; bool PrintEndLine = true; os << s.str(); - Entry->SetPrintLevel(2); + Entry->SetPrintLevel(PrintLevel); Entry->Print(os); - if ( SeqEntry* seqEntry = dynamic_cast(Entry) ) + if ( SeqEntry *seqEntry = dynamic_cast(Entry) ) { (void)seqEntry; //not used PrintEndLine = false; @@ -96,7 +98,7 @@ SQItem::~SQItem() * \ingroup SQItem * \brief canonical Writer */ -void SQItem::Write(std::ofstream* fp, FileType filetype) +void SQItem::WriteContent(std::ofstream *fp, FileType filetype) { int j; uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; @@ -109,13 +111,13 @@ void SQItem::Write(std::ofstream* fp, FileType filetype) binary_write( *fp, item[j]); // fffe e000 ffff ffff } - for (ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); - ++i) + for (ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) { // we skip delimitors (start and end one) because // we force them as 'no length' - if ( (*i)->GetGroup() == 0xfffe ) + if ( (*it)->GetGroup() == 0xfffe ) { continue; } @@ -123,12 +125,12 @@ void SQItem::Write(std::ofstream* fp, FileType filetype) // Fix in order to make some MR PHILIPS images e-film readable // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm: // we just *always* ignore spurious fffe|0000 tag ! - if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0x0000 ) + if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 ) { break; // FIXME : continue; ?!? } - (*i)->Write(fp, filetype); + (*it)->WriteContent(fp, filetype); } //we force the writting of an 'Item Delimitation' item @@ -145,7 +147,7 @@ void SQItem::Write(std::ofstream* fp, FileType filetype) /** * \brief adds any Entry (Dicom Element) to the Sequence Item */ -bool SQItem::AddEntry(DocEntry* entry) +bool SQItem::AddEntry(DocEntry *entry) { DocEntries.push_back(entry); //TODO : check if it worked @@ -165,7 +167,7 @@ bool SQItem::AddEntry(DocEntry* entry) * @return true if element was found or created successfully */ -bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, +bool SQItem::SetEntryByNumber(std::string const &val, uint16_t group, uint16_t element) { for(ListDocEntry::iterator i = DocEntries.begin(); @@ -177,7 +179,7 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, continue; } - if ( ( group < (*i)->GetGroup() ) + if ( ( group < (*i)->GetGroup() ) ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) { // instead of ReplaceOrCreateByNumber @@ -185,41 +187,23 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, ValEntry* entry = 0; TagKey key = DictEntry::TranslateToKey(group, element); - if ( ! PtagHT->count(key)) + // we assume a Public Dictionnary *is* loaded + Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); + // if the invoked (group,elem) doesn't exist inside the Dictionary + // we create a VirtualDictEntry + DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element); + if (dictEntry == NULL) { - // we assume a Public Dictionnary *is* loaded - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - // if the invoked (group,elem) doesn't exist inside the Dictionary - // we create a VirtualDictEntry - DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element); - if (dictEntry == NULL) - { - dictEntry = - Global::GetDicts()->NewVirtualDictEntry(group, element, - "UN", "??", "??"); - } - // we assume the constructor didn't fail - entry = new ValEntry(dictEntry); - /// \todo - /// ---- - /// better we don't assume too much ! - /// SQItem is now used to describe any DICOMDIR related object - } - else - { - DocEntry* foundEntry = PtagHT->find(key)->second; - entry = dynamic_cast(foundEntry); - if (!entry) - { - dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries" - " contains non ValEntry occurences"); - } - } + dictEntry = + Global::GetDicts()->NewVirtualDictEntry(group, element, + "UN", GDCM_UNKNOWN, GDCM_UNKNOWN); + } + // we assume the constructor didn't fail + entry = new ValEntry(dictEntry); if (entry) { entry->SetValue(val); } - entry->SetLength(val.length()); DocEntries.insert(i,entry); return true; @@ -230,16 +214,87 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, { entry->SetValue(val); } - (*i)->SetLength(val.length()); return true; } } return false; } -//----------------------------------------------------------------------------- -// Protected +/** + * \brief Clear the hash table from given entry AND delete the entry. + * @param entryToRemove Entry to remove AND delete. + * \warning Some problems when using under Windows... prefer the use of + * Initialize / GetNext methods + */ +bool SQItem::RemoveEntry( DocEntry* entryToRemove) +{ + for(ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + if( *it == entryToRemove) + { + DocEntries.erase(it); + gdcmVerboseMacro( "One element erased."); + delete entryToRemove; + return true; + } + } + gdcmVerboseMacro( "Value not present."); + return false ; +} +/** + * \brief Clear the hash table from given entry BUT keep the entry. + * @param entryToRemove Entry to remove. + */ +bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) +{ + for(ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + if( *it == entryToRemove) + { + DocEntries.erase(it); + gdcmVerboseMacro( "One element erased."); + return true; + } + } + + gdcmVerboseMacro( "Value not present."); + return false ; +} + +/** + * \brief Initialise the visit of the chained list + */ +void SQItem::Initialize() +{ + ItDocEntries = DocEntries.begin(); +} + +/** + * \brief Get the next entry whil visiting the chained list + * \return The next DocEntry if found, otherwhise NULL + */ +DocEntry *SQItem::GetNextEntry() +{ + if (ItDocEntries != DocEntries.end()) + { + DocEntry *tmp = *ItDocEntries; + ++ItDocEntries; + + return(tmp); + } + else + { + return(NULL); + } +} + +//----------------------------------------------------------------------------- +// Protected /** * \brief Gets a Dicom Element inside a SQ Item Entry, by number * @return