X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=88c93b3ad21c7021b5c4dac7a2201488e63f54b1;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=e82ad45d9175a9a4ddc7cc7f5bbb595394b25468;hpb=ed0cb816b9fbe45a5dfead3f7d95194e0cbbd3a4;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index e82ad45d..88c93b3a 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/19 15:24:28 $ - Version: $Revision: 1.55 $ + Date: $Date: 2005/09/06 17:15:25 $ + Version: $Revision: 1.75 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -38,6 +38,7 @@ SQItem::SQItem(int depthLevel ) : DocEntrySet( ) { SQDepthLevel = depthLevel; + SQItemNumber = 0; } /** @@ -45,57 +46,15 @@ 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, 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. + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) { @@ -111,7 +70,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 @@ -126,7 +85,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); @@ -137,111 +98,67 @@ 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 adds any Entry (Dicom Element) to 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 */ 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 elem Element number of the searched tag. - * @return true if element was found or created successfully - */ +{ + if (DocEntries.empty() ) + { + DocEntries.push_back(entry); + return true; + } + + ListDocEntry::iterator insertSpot; + ListDocEntry::iterator it = DocEntries.end(); + do + { + it--; -bool SQItem::SetEntry(std::string const &val, uint16_t group, - uint16_t elem) -{ - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); - ++i) - { - if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) + if ( (*it)->IsItemDelimitor() ) { continue; } - - if ( ( group < (*i)->GetGroup() ) - ||( group == (*i)->GetGroup() && elem < (*i)->GetElement()) ) - { - // instead of ReplaceOrCreate - // that is a method of Document :-( - ValEntry* entry = 0; - TagKey key = DictEntry::TranslateToKey(group, elem); - - // 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 - DictEntry *dictEntry = pubDict->GetDictEntry(group, elem); - if (dictEntry == NULL) - { - dictEntry = - Global::GetDicts()->NewVirtualDictEntry(group, elem, - "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() && elem == (*i)->GetElement() ) - { - if ( ValEntry *entry = dynamic_cast(*i) ) - { - entry->SetValue(val); - } - return true; - } - } - return false; -} + if ( (*it)->GetGroup() < entry->GetGroup() ) + break; + else + if ( (*it)->GetGroup() == entry->GetGroup() && + (*it)->GetElement() < entry->GetElement() ) + break; + } while (it != DocEntries.begin() ); + + insertSpot = it++; + insertSpot++; // ?!? + DocEntries.insert(insertSpot, entry); + return true; +} /** * \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(); - ++it) + it != DocEntries.end(); + ++it) { - if( *it == entryToRemove) + if ( *it == entryToRemove ) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() ); + gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() ); delete entryToRemove; return true; } } - gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() ); + gdcmWarningMacro( "Entry not found: " << entryToRemove->GetKey() ); return false ; } @@ -250,99 +167,79 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove) * @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(); - ++it) + for(ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) { - if( *it == entryToRemove) + if ( *it == entryToRemove ) { DocEntries.erase(it); - gdcmVerboseMacro( "One element erased, no destroyed: " + gdcmWarningMacro( "One element removed, no destroyed: " << entryToRemove->GetKey() ); return true; } } - gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() ); + gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() ); return false ; } /** - * \brief Get the first entry while visiting the SQItem - * \return The first DocEntry if found, otherwhise 0 + * \brief Remove all entry in the Sequence Item */ -DocEntry * SQItem::GetFirstEntry() +void SQItem::ClearEntry() { - ItDocEntries = DocEntries.begin(); - if (ItDocEntries != DocEntries.end()) - return *ItDocEntries; - return 0; + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) + { + delete *cc; + } + DocEntries.clear(); } - + /** - * \brief Get the next entry while visiting the chained list - * \return The next DocEntry if found, otherwhise NULL + * \brief Clear the std::list from given Sequence Item BUT keep the entries */ -DocEntry *SQItem::GetNextEntry() +void SQItem::ClearEntryNoDestroy() { - // gdcmAssertMacro (ItDocEntries != DocEntries.end()); - { - ++ItDocEntries; - if (ItDocEntries != DocEntries.end()) - return *ItDocEntries; - return NULL; - } + DocEntries.clear(); } -//----------------------------------------------------------------------------- -// Protected + /** - * \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 + * \brief Move all the entries from a given Sequence Item */ -DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem) +void SQItem::MoveObject(SQItem *source) { - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); ++i) - { - if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem ) - { - return *i; - } - } - return 0; + DocEntries = source->DocEntries; + source->ClearEntryNoDestroy(); } /** - * \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 + * \brief Get the first Dicom entry while visiting the SQItem + * \return The first DocEntry if found, otherwhise 0 */ -ValEntry* SQItem::GetValEntry(uint16_t group, uint16_t elem) +DocEntry *SQItem::GetFirstEntry() { - DocEntry *d = GetDocEntry(group, elem); - if ( ValEntry *e = dynamic_cast(d) ) - return e; - return 0; + ItDocEntries = DocEntries.begin(); + if ( ItDocEntries != DocEntries.end() ) + return *ItDocEntries; + 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 + * \brief Get the next Dicom entry while visiting the SQItem + * \return The next DocEntry if found, otherwhise NULL */ -BinEntry* SQItem::GetBinEntry(uint16_t group, uint16_t elem) +DocEntry *SQItem::GetNextEntry() { - DocEntry *d = GetDocEntry(group, elem); - if ( BinEntry *e = dynamic_cast(d) ) - return e; - return 0; + ++ItDocEntries; + if ( ItDocEntries != DocEntries.end() ) + return *ItDocEntries; + return NULL; } /** @@ -351,56 +248,63 @@ BinEntry* SQItem::GetBinEntry(uint16_t group, uint16_t elem) * @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 *SQItem::GetDocEntry(uint16_t group, uint16_t elem) { - DocEntry *d = GetDocEntry(group, elem); - if ( SeqEntry *e = dynamic_cast(d) ) - return e; - return 0; + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) + { + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem ) + return *i; + } + return NULL; } +//----------------------------------------------------------------------------- +// Protected -/** - * \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 'string value' of the entry whose (group,elem) was passed. - * GDCM_UNFOUND if not found - */ +//----------------------------------------------------------------------------- +// Private -std::string SQItem::GetEntry(uint16_t group, uint16_t elem) +//----------------------------------------------------------------------------- +// 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; -/* - DocEntry *e = GetFirstEntry(); - while (e) + if (SQDepthLevel > 0) { - if ( e->GetGroup() == group && e->GetElement() == elem) + for (int i = 0; i < SQDepthLevel; ++i) { - - if (ValEntry *ve = dynamic_cast(e)) - return ve->GetValue(); + s << " | " ; } - e = GetNextEntry(); - } -*/ - for(ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); ++i) + } + os << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) { - if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem) + DocEntry *Entry = *i; + bool PrintEndLine = true; + + os << s.str(); + Entry->SetPrintLevel(PrintLevel); + Entry->Print(os); + if ( dynamic_cast(Entry) ) { - if (ValEntry *ve = dynamic_cast(*i)) - return ve->GetValue(); + PrintEndLine = false; } - } - return GDCM_UNFOUND; + if (PrintEndLine) + { + os << std::endl; + } + } } -//----------------------------------------------------------------------------- -// Private - //----------------------------------------------------------------------------- - } // end namespace gdcm