X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=a95d8d16201296d1b01dba8971be46552d92fc8e;hb=d31dacbd4792e49cccecc51ffd9d93fd71541561;hp=2c7bcd796c8ab763f1b23fa3285e356017bbf77a;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 2c7bcd79..a95d8d16 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/10/22 03:05:42 $ - Version: $Revision: 1.30 $ + Date: $Date: 2004/12/07 13:39:33 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,13 +21,14 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" #include "gdcmGlobal.h" +#include "gdcmDictSet.h" #include "gdcmUtil.h" #include "gdcmDebug.h" + #include namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -45,13 +46,13 @@ SQItem::SQItem(int depthLevel ) */ SQItem::~SQItem() { - for(ListDocEntry::iterator cc = docEntries.begin(); - cc != docEntries.end(); - ++cc) + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) { - delete (*cc); + delete *cc; } - docEntries.clear(); + DocEntries.clear(); } //----------------------------------------------------------------------------- @@ -59,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) @@ -70,9 +71,9 @@ SQItem::~SQItem() s << " | " ; } } - std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); + //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { DocEntry* Entry = *i; @@ -97,22 +98,26 @@ 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 }; uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff }; //we force the writting of an 'Item' Start Element // because we want to write the Item as a 'no Length' item - fp->write((char*)&item[0],8); // fffe e000 ffff ffff + for(j=0;j<4;++j) + { + 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; } @@ -120,18 +125,21 @@ 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 // because we wrote the Item as a 'no Length' item - fp->write((char*)&itemt[0],8); // fffe e000 ffff ffff - + for(j=0;j<4;++j) + { + binary_write( *fp, itemt[j]); // fffe e000 ffff ffff + } + } //----------------------------------------------------------------------------- @@ -141,7 +149,7 @@ void SQItem::Write(std::ofstream* fp,FileType filetype) */ bool SQItem::AddEntry(DocEntry* entry) { - docEntries.push_back(entry); + DocEntries.push_back(entry); //TODO : check if it worked return true; } @@ -159,17 +167,19 @@ bool SQItem::AddEntry(DocEntry* entry) * @return true if element was found or created successfully */ -bool SQItem::SetEntryByNumber(std::string val, uint16_t group, - uint16_t element) +bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, + uint16_t element) { - for(ListDocEntry::iterator i = docEntries.begin(); i != docEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) { if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) { continue; } - if ( ( group < (*i)->GetGroup() ) + if ( ( group < (*i)->GetGroup() ) ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) { // instead of ReplaceOrCreateByNumber @@ -177,43 +187,24 @@ bool SQItem::SetEntryByNumber(std::string 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) - { - 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 + // 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) { - 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", "??", "??"); + } + // we assume the constructor didn't fail + entry = new ValEntry(dictEntry); if (entry) { entry->SetValue(val); } - entry->SetLength(val.length()); - docEntries.insert(i,entry); + DocEntries.insert(i,entry); return true; } @@ -223,24 +214,96 @@ bool SQItem::SetEntryByNumber(std::string 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); + dbg.Verbose(0, "SQItem::RemoveEntry: one element erased."); + delete entryToRemove; + return true; + } + } + + dbg.Verbose(0, "SQItem::RemoveEntry: 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); + dbg.Verbose(0, "SQItem::RemoveEntry: one element erased."); + return true; + } + } + + dbg.Verbose(0, "SQItem::RemoveEntry: 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 */ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) { - for(ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { if ( (*i)->GetGroup() == group && (*i)->GetElement() == element ) { @@ -257,8 +320,8 @@ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element) { - for(ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { if ( (*i)->GetGroup() == group && (*i)->GetElement() == element) {