X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=945ad0b2db8ec6d223fb04e5bc8e620eaf3df961;hb=95dcce2c32665bcba9aa2d20c13390271a204e23;hp=d5a1bd21200fe03d089dc0889f86ec50de70f1be;hpb=abd6bfcc2b10b5f7447d1758938d7c15c31240af;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index d5a1bd21..945ad0b2 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/07 19:20:39 $ - Version: $Revision: 1.47 $ + Date: $Date: 2005/01/30 17:30:57 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,13 +32,13 @@ namespace gdcm //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup SQItem * \brief Constructor from a given SQItem */ SQItem::SQItem(int depthLevel ) : DocEntrySet( ) { SQDepthLevel = depthLevel; + SQItemNumber = 0; } /** @@ -46,21 +46,17 @@ SQItem::SQItem(int depthLevel ) */ SQItem::~SQItem() { - for(ListDocEntry::iterator cc = DocEntries.begin(); - cc != DocEntries.end(); - ++cc) - { - delete *cc; - } - DocEntries.clear(); + ClearEntry(); } //----------------------------------------------------------------------------- // 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 +67,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 +78,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,8 +90,9 @@ void SQItem::Print(std::ostream &os) } /* - * \ingroup SQItem * \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,89 +140,36 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) //----------------------------------------------------------------------------- // Public +/** + * \brief Remove all entry in the Sequence Item + */ +void SQItem::ClearEntry() +{ + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) + { + delete *cc; + } + DocEntries.clear(); +} + /** * \brief adds any Entry (Dicom Element) to the Sequence Item + * @param entry Entry to add */ bool SQItem::AddEntry(DocEntry *entry) { DocEntries.push_back(entry); - //TODO : check if it worked return true; } /** - * \brief Sets Entry (Dicom Element) value of an element, - * specified by it's tag (Group, Number) - * and the length, too ... inside a SQ Item - * If the Element is not found, it's just created ! - * \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 element 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) -{ - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); - ++i) - { - if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) - { - continue; - } - - if ( ( group < (*i)->GetGroup() ) - ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) - { - // instead of ReplaceOrCreateByNumber - // that is a method of Document :-( - ValEntry* entry = 0; - TagKey key = DictEntry::TranslateToKey(group, element); - - // 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", GDCM_UNKNOWN, GDCM_UNKNOWN); - } - // we assume the constructor didn't fail - entry = new ValEntry(dictEntry); - if (entry) - { - entry->SetValue(val); - } - DocEntries.insert(i,entry); - - return true; - } - if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) - { - if ( ValEntry* entry = dynamic_cast(*i) ) - { - entry->SetValue(val); - } - return true; - } - } - return false; -} - -/** - * \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) +bool SQItem::RemoveEntry( DocEntry *entryToRemove) { for(ListDocEntry::iterator it = DocEntries.begin(); it != DocEntries.end(); @@ -235,21 +178,21 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove) if( *it == entryToRemove) { DocEntries.erase(it); - gdcmVerboseMacro( "SQItem::RemoveEntry: one element erased."); + gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() ); delete entryToRemove; return true; } } - - gdcmVerboseMacro( "SQItem::RemoveEntry: 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) +bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove) { for(ListDocEntry::iterator it = DocEntries.begin(); it != DocEntries.end(); @@ -258,78 +201,60 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) if( *it == entryToRemove) { DocEntries.erase(it); - gdcmVerboseMacro( "SQItem::RemoveEntry: one element erased."); + gdcmVerboseMacro( "One element erased, no destroyed: " + << entryToRemove->GetKey() ); return true; } } - gdcmVerboseMacro( "SQItem::RemoveEntry: 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 whil 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() { + ++ItDocEntries; if (ItDocEntries != DocEntries.end()) - { - DocEntry *tmp = *ItDocEntries; - ++ItDocEntries; - - return(tmp); - } - else - { - return(NULL); - } + return *ItDocEntries; + return NULL; } -//----------------------------------------------------------------------------- -// Protected /** - * \brief Gets a Dicom Element inside a SQ Item Entry, by number - * @return + * \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 */ -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; - } } - return 0; + return NULL; } -/** - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by number - * @return - */ +//----------------------------------------------------------------------------- +// Protected -std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element) -{ - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); ++i) - { - if ( (*i)->GetGroup() == group && (*i)->GetElement() == element) - { - return ((ValEntry *)(*i))->GetValue(); //FIXME - } - } - return GDCM_UNFOUND; -} //----------------------------------------------------------------------------- // Private