X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=d4055914663513f5960d2dbeceea8ac0f551c0ed;hb=5887c4beef24959af83e43efad0bb86acac9339e;hp=c2481956493c5d8000a7e1f35f85c8261fa23811;hpb=a2040ffd26fc9a3c835b6c45b92a808f1d001b36;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index c2481956..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: 2005/01/05 15:38:28 $ - Version: $Revision: 1.44 $ + 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,7 +60,7 @@ SQItem::~SQItem() /* * \brief canonical Printer */ -void SQItem::Print(std::ostream& os) +void SQItem::Print(std::ostream &os) { std::ostringstream s; @@ -76,13 +76,13 @@ void SQItem::Print(std::ostream& os) 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 PrintEndLine = false; @@ -98,7 +98,7 @@ 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 +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 @@ -163,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,23 +180,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 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", GDCM_UNKNOWN, GDCM_UNKNOWN); + Global::GetDicts()->NewVirtualDictEntry(group, elem, + "UN", GDCM_UNKNOWN, + GDCM_UNKNOWN); } // we assume the constructor didn't fail entry = new ValEntry(dictEntry); @@ -208,7 +209,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 +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. @@ -258,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 ; } @@ -286,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; } @@ -314,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 }