X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=d4055914663513f5960d2dbeceea8ac0f551c0ed;hb=5887c4beef24959af83e43efad0bb86acac9339e;hp=a9c1ed5efcc8fb523f3ab91c2a16ffeb9b8ac918;hpb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index a9c1ed5e..d4055914 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/12/03 20:16:58 $ - Version: $Revision: 1.40 $ + Date: $Date: 2005/01/11 00:21:48 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -60,9 +60,8 @@ SQItem::~SQItem() /* * \brief canonical Printer */ - void SQItem::Print(std::ostream& os) - { - os << "S "; +void SQItem::Print(std::ostream &os) +{ std::ostringstream s; if (SQDepthLevel > 0) @@ -77,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; @@ -99,7 +98,7 @@ SQItem::~SQItem() * \ingroup SQItem * \brief canonical Writer */ -void SQItem::WriteContent(std::ofstream* fp, FileType filetype) +void SQItem::WriteContent(std::ofstream *fp, FileType filetype) { int j; uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; @@ -148,7 +147,7 @@ void SQItem::WriteContent(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 @@ -164,12 +163,12 @@ 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 const & 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(); @@ -180,60 +179,42 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, 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 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->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); 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; } } @@ -255,16 +236,15 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove) if( *it == entryToRemove) { DocEntries.erase(it); - dbg.Verbose(0, "SQItem::RemoveEntry: one element erased."); + gdcmVerboseMacro( "One element erased."); delete entryToRemove; return true; } } - - dbg.Verbose(0, "SQItem::RemoveEntry: value not present "); + gdcmVerboseMacro( "Value not present."); return false ; } - + /** * \brief Clear the hash table from given entry BUT keep the entry. * @param entryToRemove Entry to remove. @@ -278,12 +258,12 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) if( *it == entryToRemove) { DocEntries.erase(it); - dbg.Verbose(0, "SQItem::RemoveEntry: one element erased."); + gdcmVerboseMacro( "One element erased."); return true; } } - dbg.Verbose(0, "SQItem::RemoveEntry: value not present "); + gdcmVerboseMacro( "Value not present."); return false ; } @@ -306,26 +286,28 @@ DocEntry *SQItem::GetNextEntry() DocEntry *tmp = *ItDocEntries; ++ItDocEntries; - return(tmp); + return tmp; } else { - return(NULL); + 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) { - if ( (*i)->GetGroup() == group && (*i)->GetElement() == element ) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem ) { return *i; } @@ -334,16 +316,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) { - if ( (*i)->GetGroup() == group && (*i)->GetElement() == element) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem) { return ((ValEntry *)(*i))->GetValue(); //FIXME }