X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=4717dcb0274a19e83af24ab424abdd93477cf543;hb=963480c814326423065a4a02fa1bf8bc1243ae4f;hp=ac3442dde84108873911b72407a18fac2171a06b;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index ac3442dd..4717dcb0 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/12 04:35:47 $ - Version: $Revision: 1.29 $ + Date: $Date: 2005/01/18 08:01:42 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,16 +21,17 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" #include "gdcmGlobal.h" +#include "gdcmDictSet.h" #include "gdcmUtil.h" #include "gdcmDebug.h" +#include + namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup SQItem * \brief Constructor from a given SQItem */ SQItem::SQItem(int depthLevel ) @@ -44,13 +45,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(); } //----------------------------------------------------------------------------- @@ -58,8 +59,8 @@ SQItem::~SQItem() /* * \brief canonical Printer */ - void SQItem::Print(std::ostream& os) - { +void SQItem::Print(std::ostream &os, std::string const &) +{ std::ostringstream s; if (SQDepthLevel > 0) @@ -69,20 +70,20 @@ SQItem::~SQItem() s << " | " ; } } - std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); + os << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = DocEntries.begin(); + 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 + //(void)seqEntry; //not used PrintEndLine = false; } if (PrintEndLine) @@ -93,25 +94,28 @@ SQItem::~SQItem() } /* - * \ingroup SQItem * \brief canonical Writer */ -void SQItem::Write(FILE* 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 - fwrite(&item[0],8,1,fp); // 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; } @@ -119,18 +123,21 @@ void SQItem::Write(FILE* 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 - fwrite(&itemt[0],8,1,fp); // fffe e000 ffff ffff - + for(j=0;j<4;++j) + { + binary_write( *fp, itemt[j]); // fffe e000 ffff ffff + } + } //----------------------------------------------------------------------------- @@ -138,9 +145,9 @@ void SQItem::Write(FILE* 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); + DocEntries.push_back(entry); //TODO : check if it worked return true; } @@ -154,94 +161,151 @@ bool SQItem::AddEntry(DocEntry* entry) * (NOT a shadow one) * @param val string value to set * @param group Group number of the searched tag. - * @param element Element number of the searched tag. + * @param elem Element number of the searched tag. * @return true if element was found or created successfully */ -bool SQItem::SetEntryByNumber(std::string val, uint16_t group, - uint16_t element) +bool SQItem::SetEntry(std::string const &val, uint16_t group, + uint16_t elem) { - 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() ) - ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) + if ( ( group < (*i)->GetGroup() ) + ||( group == (*i)->GetGroup() && elem < (*i)->GetElement()) ) { - // instead of ReplaceOrCreateByNumber + // instead of ReplaceOrCreate // that is a method of Document :-( ValEntry* entry = 0; - TagKey key = DictEntry::TranslateToKey(group, element); + TagKey key = DictEntry::TranslateToKey(group, elem); - 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 Dictionary *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->GetDictEntry(group, elem); + 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, elem, + "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); + DocEntries.insert(i,entry); return true; } - if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) + if (group == (*i)->GetGroup() && elem == (*i)->GetElement() ) { if ( ValEntry* entry = dynamic_cast(*i) ) { 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 while 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 + * \brief Gets a Dicom Element inside a SQ Item Entry + * @param group Group number of the Entry + * @param elem Element number of the Entry * @return */ -DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) +DocEntry* SQItem::GetDocEntry(uint16_t group, uint16_t elem) { - 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 ) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem ) { return *i; } @@ -250,16 +314,18 @@ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) } /** - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by number + * \brief Get the value of a Dicom Element inside a SQ Item Entry + * @param group Group number of the Entry + * @param elem Element number of the Entry * @return */ -std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element) +std::string SQItem::GetEntry(uint16_t group, uint16_t elem) { - 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) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem) { return ((ValEntry *)(*i))->GetValue(); //FIXME }