X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=b6c5dd0d31c9a9045d7abbc1ea2b0a5fbe2ff82d;hb=add6c88b334e9cf4ddb0ae1849f1380f9844f99c;hp=3180df8a39e0fe853f08ee3a331d24d18e09a98e;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 3180df8a..b6c5dd0d 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/02/01 10:29:56 $ - Version: $Revision: 1.64 $ + Date: $Date: 2007/10/08 15:20:17 $ + Version: $Revision: 1.88 $ 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" @@ -27,7 +25,7 @@ #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -56,21 +54,22 @@ SQItem::~SQItem() * @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) +void SQItem::WriteContent(std::ofstream *fp, FileType filetype, + bool , bool ) { int j; uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; - uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff }; + uint16_t itemt[4]= { 0xfffe, 0xe00d, 0x0000, 0x0000 }; //we force the writting of an 'Item' Start Element - // because we want to write the Item as a 'no Length' item + // because we want to write the Item as a 'No Length' item for(j=0;j<4;++j) { binary_write( *fp, item[j]); // fffe e000 ffff ffff } for (ListDocEntry::iterator it = DocEntries.begin(); - it != DocEntries.end(); + it != DocEntries.end(); ++it) { // we skip delimitors (start and end one) because @@ -85,42 +84,83 @@ 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); + // false : we are not in MetaElements + // true : we are inside a Sequence + (*it)->WriteContent(fp, filetype, false, true); } //we force the writting of an 'Item Delimitation' item // because we wrote the Item as a 'no Length' item for(j=0;j<4;++j) { - binary_write( *fp, itemt[j]); // fffe e000 ffff ffff - } - + binary_write( *fp, itemt[j]); // fffe e000 0000 0000 + } } /** - * \brief Remove all entry in the Sequence Item + * \brief Compute the full length of the SQItem (not only value length) + * depending on the VR. */ -void SQItem::ClearEntry() +uint32_t SQItem::ComputeFullLength() { - for(ListDocEntry::iterator cc = DocEntries.begin(); - cc != DocEntries.end(); - ++cc) - { - delete *cc; + uint32_t l = 8; // Item Starter length + for (ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + // we skip delimitors (start and end one) because + // we force them as 'no length' + if ( (*it)->GetGroup() == 0xfffe ) + { + continue; + } + l += (*it)->ComputeFullLength(); } - DocEntries.clear(); + l += 8; // 'Item Delimitation' item + return l; } /** - * \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); +{ + if (DocEntries.empty() ) + { + DocEntries.push_back(entry); + entry->Register(); + return true; + } + + ListDocEntry::iterator insertSpot; + ListDocEntry::iterator it = DocEntries.end(); + do + { + it--; + + 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; + DocEntries.insert(insertSpot, entry); + entry->Register(); return true; } @@ -129,48 +169,38 @@ 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; + gdcmDebugMacro( "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 Get the first Dicom entry while visiting the SQItem * \return The first DocEntry if found, otherwhise 0 @@ -178,19 +208,19 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove) 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() { ++ItDocEntries; - if (ItDocEntries != DocEntries.end()) + if ( ItDocEntries != DocEntries.end() ) return *ItDocEntries; return NULL; } @@ -203,8 +233,9 @@ DocEntry *SQItem::GetNextEntry() */ 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 ) return *i; @@ -212,6 +243,30 @@ DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem) return NULL; } +/** + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries a not copied, only referenced + */ +void SQItem::Copy(DocEntrySet *set) +{ + // Remove all previous entries + ClearEntry(); + + DocEntrySet::Copy(set); + + SQItem *sq = dynamic_cast(set); + if( sq ) + { + SQDepthLevel = sq->SQDepthLevel; + SQItemNumber = sq->SQItemNumber; + + DocEntries = sq->DocEntries; + for(ItDocEntries = DocEntries.begin();ItDocEntries != DocEntries.end();++ItDocEntries) + (*ItDocEntries)->Register(); + } +} + //----------------------------------------------------------------------------- // Protected