X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=b6c5dd0d31c9a9045d7abbc1ea2b0a5fbe2ff82d;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=0ed62981aeec4deb87fe99b01256ed36350abb12;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 0ed62981..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/10/18 08:35:50 $ - Version: $Revision: 1.76 $ + 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 @@ -25,7 +25,7 @@ #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -54,14 +54,15 @@ 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 @@ -87,18 +88,42 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype) // --> 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 Compute the full length of the SQItem (not only value length) + * depending on the VR. + */ +uint32_t SQItem::ComputeFullLength() +{ + 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(); + } + l += 8; // 'Item Delimitation' item + return l; +} + /** * \brief Inserts *in the right place* any Entry (Dicom Element) * into the Sequence Item @@ -110,6 +135,7 @@ bool SQItem::AddEntry(DocEntry *entry) if (DocEntries.empty() ) { DocEntries.push_back(entry); + entry->Register(); return true; } @@ -131,9 +157,10 @@ bool SQItem::AddEntry(DocEntry *entry) break; } while (it != DocEntries.begin() ); - insertSpot = it++; - insertSpot++; // ?!? + ++it; + insertSpot = it; DocEntries.insert(insertSpot, entry); + entry->Register(); return true; } @@ -151,8 +178,8 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove ) if ( *it == entryToRemove ) { DocEntries.erase(it); - gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() ); - delete entryToRemove; + gdcmDebugMacro( "One element erased: " << entryToRemove->GetKey() ); + entryToRemove->Unregister(); return true; } } @@ -160,30 +187,6 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove ) 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 - */ -bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove) -{ - for(ListDocEntry::iterator it = DocEntries.begin(); - it != DocEntries.end(); - ++it) - { - if ( *it == entryToRemove ) - { - DocEntries.erase(it); - gdcmWarningMacro( "One element removed, no destroyed: " - << entryToRemove->GetKey() ); - return true; - } - } - - gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() ); - return false ; -} - /** * \brief Remove all entry in the Sequence Item */ @@ -193,29 +196,11 @@ void SQItem::ClearEntry() cc != DocEntries.end(); ++cc) { - delete *cc; + (*cc)->Unregister(); } DocEntries.clear(); } -/** - * \brief Clear the std::list from given Sequence Item BUT keep the entries - */ -void SQItem::ClearEntryNoDestroy() -{ - DocEntries.clear(); -} - - -/** - * \brief Move all the entries from a given Sequence Item - */ -void SQItem::MoveObject(SQItem *source) -{ - DocEntries = source->DocEntries; - source->ClearEntryNoDestroy(); -} - /** * \brief Get the first Dicom entry while visiting the SQItem * \return The first DocEntry if found, otherwhise 0 @@ -258,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