X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=7c8d61c6e5373241d79a2ecac1a420541bfbc4cf;hb=c11ceb36d532037062ada59bfdeea3d24115bc8f;hp=0431202ca3bbf3c16c1f69236af1d0baa5c45fb6;hpb=ce8913daafe02955368fd2f07e777e86824467cc;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 0431202c..7c8d61c6 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/25 15:44:24 $ - Version: $Revision: 1.60 $ + Date: $Date: 2005/10/24 16:00:48 $ + Version: $Revision: 1.77 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,8 +18,6 @@ #include "gdcmSQItem.h" #include "gdcmSeqEntry.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmGlobal.h" #include "gdcmDictSet.h" #include "gdcmUtil.h" @@ -50,45 +48,7 @@ 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 &) -{ - std::ostringstream s; - - if (SQDepthLevel > 0) - { - for (int i = 0; i < SQDepthLevel; ++i) - { - s << " | " ; - } - } - os << s.str() << " --- SQItem number " << SQItemNumber << std::endl; - for (ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); - ++i) - { - DocEntry *Entry = *i; - bool PrintEndLine = true; - - os << s.str(); - Entry->SetPrintLevel(PrintLevel); - Entry->Print(os); - if ( dynamic_cast(Entry) ) - { - PrintEndLine = false; - } - if (PrintEndLine) - { - os << std::endl; - } - } -} - +// Public /* * \brief canonical Writer * @param fp file pointer to an already open file. @@ -108,7 +68,7 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) } for (ListDocEntry::iterator it = DocEntries.begin(); - it != DocEntries.end(); + it != DocEntries.end(); ++it) { // we skip delimitors (start and end one) because @@ -123,7 +83,9 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) // we just *always* ignore spurious fffe|0000 tag ! if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 ) { - break; // FIXME : continue; ?!? + break; // FIXME : break or continue; ?!? + // --> makes no difference since the only bugged file we have + // contains 'impossible tag' fffe|0000 in last position ! } (*it)->WriteContent(fp, filetype); @@ -134,34 +96,47 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) for(j=0;j<4;++j) { binary_write( *fp, itemt[j]); // fffe e000 ffff ffff - } - + } } -//----------------------------------------------------------------------------- -// Public /** - * \brief Remove all entry in the Sequence Item + * \brief Inserts *in the right place* any Entry (Dicom Element) + * into the Sequence Item + * @param entry Entry to add + * @return always true */ -void SQItem::ClearEntry() -{ - for(ListDocEntry::iterator cc = DocEntries.begin(); - cc != DocEntries.end(); - ++cc) +bool SQItem::AddEntry(DocEntry *entry) +{ + if (DocEntries.empty() ) { - delete *cc; + DocEntries.push_back(entry); + entry->Register(); + return true; } - DocEntries.clear(); -} + + ListDocEntry::iterator insertSpot; + ListDocEntry::iterator it = DocEntries.end(); + do + { + it--; -/** - * \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 + if ( (*it)->IsItemDelimitor() ) + { + continue; + } + if ( (*it)->GetGroup() < entry->GetGroup() ) + break; + else + if ( (*it)->GetGroup() == entry->GetGroup() && + (*it)->GetElement() < entry->GetElement() ) + break; + } while (it != DocEntries.begin() ); + + ++it; + insertSpot = it; + //++insertSpot; // ?!? + DocEntries.insert(insertSpot, entry); + entry->Register(); return true; } @@ -170,87 +145,84 @@ bool SQItem::AddEntry(DocEntry *entry) * @param entryToRemove Entry to remove AND delete. * @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(); - ++it) + it != DocEntries.end(); + ++it) { - if( *it == entryToRemove) + if ( *it == entryToRemove ) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() ); - delete entryToRemove; + gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() ); + entryToRemove->Unregister(); return true; } } - gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() ); + gdcmWarningMacro( "Entry not found: " << entryToRemove->GetKey() ); return false ; } /** - * \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 + * \brief Remove all entry in the Sequence Item */ -bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) +void SQItem::ClearEntry() { - for(ListDocEntry::iterator it = DocEntries.begin(); - it != DocEntries.end(); - ++it) + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) { - if( *it == entryToRemove) - { - DocEntries.erase(it); - gdcmVerboseMacro( "One element erased, no destroyed: " - << entryToRemove->GetKey() ); - return true; - } + (*cc)->Unregister(); } - - gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() ); - return false ; + DocEntries.clear(); } - + +/** + * \brief Move all the entries from a given Sequence Item + */ +void SQItem::MoveObject(SQItem *source) +{ + DocEntries = source->DocEntries; + source->DocEntries.clear(); +} + /** * \brief Get the first Dicom entry while visiting the SQItem * \return The first DocEntry if found, otherwhise 0 */ -DocEntry * SQItem::GetFirstEntry() +DocEntry *SQItem::GetFirstEntry() { ItDocEntries = DocEntries.begin(); - if (ItDocEntries != DocEntries.end()) + if ( ItDocEntries != DocEntries.end() ) return *ItDocEntries; return 0; } /** - * \brief Get the next Dicom entry while visiting the chained list + * \brief Get the next Dicom entry while visiting the SQItem * \return The next DocEntry if found, otherwhise NULL */ DocEntry *SQItem::GetNextEntry() { - // gdcmAssertMacro (ItDocEntries != DocEntries.end()); - { - ++ItDocEntries; - if (ItDocEntries != DocEntries.end()) - return *ItDocEntries; - return NULL; - } + ++ItDocEntries; + if ( ItDocEntries != DocEntries.end() ) + return *ItDocEntries; + return NULL; } /** * \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 Entry whose (group,elem) was passed. 0 if not found */ DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem) { - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==elem ) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem ) return *i; } return NULL; @@ -262,7 +234,45 @@ DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem) //----------------------------------------------------------------------------- // Private - //----------------------------------------------------------------------------- +// 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 &) +{ + std::ostringstream s; + + if (SQDepthLevel > 0) + { + for (int i = 0; i < SQDepthLevel; ++i) + { + s << " | " ; + } + } + os << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) + { + DocEntry *Entry = *i; + bool PrintEndLine = true; + + os << s.str(); + Entry->SetPrintLevel(PrintLevel); + Entry->Print(os); + if ( dynamic_cast(Entry) ) + { + PrintEndLine = false; + } + if (PrintEndLine) + { + os << std::endl; + } + } +} +//----------------------------------------------------------------------------- } // end namespace gdcm