X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=4717dcb0274a19e83af24ab424abdd93477cf543;hb=038a3b7f67769dc20b4c46f3c9dcad7cc63d1161;hp=399c466f942ec3e43cde9b207791dec2d7ab2660;hpb=f5c7e83afd484a025285c64a09a89bd227087245;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 399c466f..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/12/16 13:46:37 $ - Version: $Revision: 1.43 $ + 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 @@ -32,7 +32,6 @@ namespace gdcm //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup SQItem * \brief Constructor from a given SQItem */ SQItem::SQItem(int depthLevel ) @@ -60,7 +59,7 @@ SQItem::~SQItem() /* * \brief canonical Printer */ -void SQItem::Print(std::ostream& os) +void SQItem::Print(std::ostream &os, std::string const &) { std::ostringstream s; @@ -71,20 +70,20 @@ void SQItem::Print(std::ostream& os) s << " | " ; } } - //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + 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(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) @@ -95,10 +94,9 @@ void SQItem::Print(std::ostream& os) } /* - * \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 }; @@ -147,7 +145,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 @@ -163,12 +161,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,23 +178,24 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, } if ( ( group < (*i)->GetGroup() ) - ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) + ||( 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); - // we assume a Public Dictionnary *is* loaded + // 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->GetDictEntryByNumber(group, element); + DictEntry *dictEntry = pubDict->GetDictEntry(group, elem); if (dictEntry == NULL) { dictEntry = - Global::GetDicts()->NewVirtualDictEntry(group, element, - "UN", "??", "??"); + Global::GetDicts()->NewVirtualDictEntry(group, elem, + "UN", GDCM_UNKNOWN, + GDCM_UNKNOWN); } // we assume the constructor didn't fail entry = new ValEntry(dictEntry); @@ -208,7 +207,7 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, return true; } - if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) + if (group == (*i)->GetGroup() && elem == (*i)->GetElement() ) { if ( ValEntry* entry = dynamic_cast(*i) ) { @@ -235,16 +234,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. @@ -258,12 +256,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 ; } @@ -276,7 +274,7 @@ void SQItem::Initialize() } /** - * \brief Get the next entry whil visiting the chained list + * \brief Get the next entry while visiting the chained list * \return The next DocEntry if found, otherwhise NULL */ DocEntry *SQItem::GetNextEntry() @@ -286,26 +284,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; } @@ -314,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) { - if ( (*i)->GetGroup() == group && (*i)->GetElement() == element) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem) { return ((ValEntry *)(*i))->GetValue(); //FIXME }