X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=e82ad45d9175a9a4ddc7cc7f5bbb595394b25468;hb=93748f382dadb5c9240c4156ce7bbe9dcc8da44f;hp=d4055914663513f5960d2dbeceea8ac0f551c0ed;hpb=827d0d72b115d9e54aac8f0b054856dffff862ca;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index d4055914..e82ad45d 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/11 00:21:48 $ - Version: $Revision: 1.50 $ + Date: $Date: 2005/01/19 15:24:28 $ + Version: $Revision: 1.55 $ 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 ) @@ -59,8 +58,10 @@ SQItem::~SQItem() // Print /* * \brief canonical Printer + * @param os Stream to print to. + * @param indent Indentation string to be prepended during printing. */ -void SQItem::Print(std::ostream &os) +void SQItem::Print(std::ostream &os, std::string const &) { std::ostringstream s; @@ -71,7 +72,7 @@ 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) @@ -82,9 +83,8 @@ void SQItem::Print(std::ostream &os) os << s.str(); Entry->SetPrintLevel(PrintLevel); Entry->Print(os); - if ( SeqEntry *seqEntry = dynamic_cast(Entry) ) + if ( dynamic_cast(Entry) ) { - (void)seqEntry; //not used PrintEndLine = false; } if (PrintEndLine) @@ -95,7 +95,6 @@ void SQItem::Print(std::ostream &os) } /* - * \ingroup SQItem * \brief canonical Writer */ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) @@ -187,7 +186,7 @@ bool SQItem::SetEntry(std::string const &val, uint16_t group, ValEntry* entry = 0; 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 @@ -211,7 +210,7 @@ bool SQItem::SetEntry(std::string const &val, uint16_t group, } if (group == (*i)->GetGroup() && elem == (*i)->GetElement() ) { - if ( ValEntry* entry = dynamic_cast(*i) ) + if ( ValEntry *entry = dynamic_cast(*i) ) { entry->SetValue(val); } @@ -222,10 +221,11 @@ bool SQItem::SetEntry(std::string const &val, uint16_t group, } /** - * \brief Clear the hash table from given entry AND delete the entry. + * \brief Clear the std::list 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 + * @return true if the entry was found and removed; false otherwise */ bool SQItem::RemoveEntry( DocEntry* entryToRemove) { @@ -236,18 +236,19 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove) if( *it == entryToRemove) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased."); + gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() ); delete entryToRemove; return true; } } - gdcmVerboseMacro( "Value not present."); + gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() ); return false ; } /** - * \brief Clear the hash table from given entry BUT keep the entry. + * \brief Clear the std::list from given entry BUT keep the entry. * @param entryToRemove Entry to remove. + * @return true if the entry was found and removed; false otherwise */ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) { @@ -258,38 +259,39 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) if( *it == entryToRemove) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased."); + gdcmVerboseMacro( "One element erased, no destroyed: " + << entryToRemove->GetKey() ); return true; } } - gdcmVerboseMacro( "Value not present."); + gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() ); return false ; } /** - * \brief Initialise the visit of the chained list + * \brief Get the first entry while visiting the SQItem + * \return The first DocEntry if found, otherwhise 0 */ -void SQItem::Initialize() +DocEntry * SQItem::GetFirstEntry() { ItDocEntries = DocEntries.begin(); + if (ItDocEntries != DocEntries.end()) + return *ItDocEntries; + return 0; } /** - * \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() { - if (ItDocEntries != DocEntries.end()) + // gdcmAssertMacro (ItDocEntries != DocEntries.end()); { - DocEntry *tmp = *ItDocEntries; ++ItDocEntries; - - return tmp; - } - else - { + if (ItDocEntries != DocEntries.end()) + return *ItDocEntries; return NULL; } } @@ -300,9 +302,9 @@ DocEntry *SQItem::GetNextEntry() * \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 + * @return Entry whose (group,elem) was passed. 0 if not found */ -DocEntry* SQItem::GetDocEntry(uint16_t group, uint16_t elem) +DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem) { for(ListDocEntry::iterator i = DocEntries.begin(); i != DocEntries.end(); ++i) @@ -315,21 +317,82 @@ DocEntry* SQItem::GetDocEntry(uint16_t group, uint16_t elem) return 0; } +/** + * \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 Entry whose (group,elem) was passed. 0 if not found + */ +ValEntry* SQItem::GetValEntry(uint16_t group, uint16_t elem) +{ + DocEntry *d = GetDocEntry(group, elem); + if ( ValEntry *e = dynamic_cast(d) ) + return e; + return 0; +} + +/** + * \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 Entry whose (group,elem) was passed. 0 if not found + */ +BinEntry* SQItem::GetBinEntry(uint16_t group, uint16_t elem) +{ + DocEntry *d = GetDocEntry(group, elem); + if ( BinEntry *e = dynamic_cast(d) ) + return e; + return 0; +} + +/** + * \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 Entry whose (group,elem) was passed. 0 if not found + */ +SeqEntry* SQItem::GetSeqEntry(uint16_t group, uint16_t elem) +{ + DocEntry *d = GetDocEntry(group, elem); + if ( SeqEntry *e = dynamic_cast(d) ) + return e; + return 0; +} + + /** * \brief Get the value of a Dicom Element inside a SQ Item Entry + * \note : meaningfull only if the required entry is NEITHER a SeqEntry + * NOR a BinEntry * @param group Group number of the Entry * @param elem Element number of the Entry - * @return + * @return 'string value' of the entry whose (group,elem) was passed. + * GDCM_UNFOUND if not found */ std::string SQItem::GetEntry(uint16_t group, uint16_t elem) { + +/* + DocEntry *e = GetFirstEntry(); + while (e) + { + if ( e->GetGroup() == group && e->GetElement() == elem) + { + + if (ValEntry *ve = dynamic_cast(e)) + return ve->GetValue(); + } + e = GetNextEntry(); + } +*/ for(ListDocEntry::iterator i = DocEntries.begin(); i != DocEntries.end(); ++i) { if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem) { - return ((ValEntry *)(*i))->GetValue(); //FIXME + if (ValEntry *ve = dynamic_cast(*i)) + return ve->GetValue(); } } return GDCM_UNFOUND;