X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=7ca6d20260f73dd09e72b3fce3ca809c2cc6585b;hb=4f9bdf403cb37c61df4da30f9fd9f5d9fe4da9bb;hp=4717dcb0274a19e83af24ab424abdd93477cf543;hpb=038a3b7f67769dc20b4c46f3c9dcad7cc63d1161;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 4717dcb0..7ca6d202 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/18 08:01:42 $ - Version: $Revision: 1.53 $ + Date: $Date: 2005/01/24 16:10:53 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -58,6 +58,8 @@ 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, std::string const &) { @@ -81,9 +83,8 @@ void SQItem::Print(std::ostream &os, std::string const &) 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,6 +96,8 @@ void SQItem::Print(std::ostream &os, std::string const &) /* * \brief canonical Writer + * @param fp file pointer to an already open file. + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) { @@ -144,6 +147,7 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) // Public /** * \brief adds any Entry (Dicom Element) to the Sequence Item + * @param entry Entry to add */ bool SQItem::AddEntry(DocEntry *entry) { @@ -160,12 +164,12 @@ bool SQItem::AddEntry(DocEntry *entry) * \warning we suppose, right now, the element belongs to a Public Group * (NOT a shadow one) * @param val string value to set - * @param group Group number of the searched tag. + * @param group Group number of the searched tag. * @param elem Element number of the searched tag. * @return true if element was found or created successfully */ -bool SQItem::SetEntry(std::string const &val, uint16_t group, +bool SQItem::SetEntryValue(std::string const &val, uint16_t group, uint16_t elem) { for(ListDocEntry::iterator i = DocEntries.begin(); @@ -189,7 +193,7 @@ bool SQItem::SetEntry(std::string const &val, uint16_t group, 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); + DictEntry *dictEntry = pubDict->GetEntry(group, elem); if (dictEntry == NULL) { dictEntry = @@ -209,7 +213,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); } @@ -220,10 +224,9 @@ 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) { @@ -234,18 +237,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) { @@ -256,38 +260,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 Dicom 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 while visiting the chained list + * \brief Get the next Dicom 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; } } @@ -296,11 +301,11 @@ DocEntry *SQItem::GetNextEntry() // Protected /** * \brief Gets a Dicom Element inside a SQ Item Entry - * @param group Group number of the 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) @@ -313,21 +318,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) +std::string SQItem::GetEntryValue(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;