X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=7b047295c3205a8fdd7190561e10987e32d0ba23;hb=bd7bec4c367d671a9da358584e98a8ec29bb641e;hp=ace2fa4611b30bd0f2fcd34a3b757ca7bbf7db8a;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index ace2fa46..7b047295 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 16:18:49 $ - Version: $Revision: 1.53 $ + Date: $Date: 2007/10/08 15:20:17 $ + Version: $Revision: 1.72 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,15 +27,17 @@ #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- +// Constructor / Destructor + // Constructor / Destructor /** * \brief Constructor from a given SeqEntry */ -SeqEntry::SeqEntry( DictEntry *e ) - : DocEntry(e) +SeqEntry::SeqEntry( uint16_t group,uint16_t elem ) + : DocEntry(group, elem, "SQ") { Length = 0; ReadLength = 0xffffffff; @@ -46,12 +48,13 @@ SeqEntry::SeqEntry( DictEntry *e ) } /** - * \brief Constructor from a given SeqEntry + * \brief Constructor from a given DocEntry * @param e Pointer to existing Doc entry * @param depth depth level of the current Seq entry */ SeqEntry::SeqEntry( DocEntry *e, int depth ) - : DocEntry( e->GetDictEntry() ) + //: DocEntry( e->GetDictEntry() ) + : DocEntry( e->GetGroup(), e->GetElement(), "SQ" /*e->GetVR()*/ ) { Length = 0; ReadLength = 0xffffffff; @@ -77,21 +80,23 @@ SeqEntry::~SeqEntry() * @param fp pointer to an already open file * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ -void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) +void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype, bool , bool ) { uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; - uint32_t seq_term_lg = 0xffffffff; - - //uint16_t item_term_gr = 0xfffe; - //uint16_t item_term_el = 0xe00d; - - DocEntry::WriteContent(fp, filetype); + uint32_t seq_term_lg = 0x00000000; + + // ignore 'Zero length' Sequences + if ( GetReadLength() == 0 ) + return; + // false : we are not in MetaElements + // true : we are inside a Sequence + DocEntry::WriteContent(fp, filetype, false, true); for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) - { - (*cc)->WriteContent(fp, filetype); + { + (*cc)->WriteContent(fp, filetype, false, true); } // we force the writting of a Sequence Delimitation item @@ -101,6 +106,23 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) binary_write(*fp, seq_term_lg); } +/** + * \brief Compute the full length of the SeqEntry (not only value + * length) depending on the VR. + */ +uint32_t SeqEntry::ComputeFullLength() +{ + uint32_t l = 12; // Tag (4) + VR (explicit) 4 + 4 (length); + for(ListSQItem::iterator cc = Items.begin(); + cc != Items.end(); + ++cc) + { + l += (*cc)->ComputeFullLength(); + } + l += 8; // seq_term Tag (4) + seq_term_lg (4) + return l; +} + /** * \brief adds the passed ITEM to the ITEM chained List for this SeQuence. * @param sqItem SQItem to be pushed back in the SeqEntry @@ -116,6 +138,7 @@ void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber) // Or we can add (or remove) anywhere, and SQItemNumber will be broken sqItem->SetSQItemNumber(itemNumber); Items.push_back(sqItem); + sqItem->Register(); } /** @@ -125,11 +148,11 @@ void SeqEntry::ClearSQItem() { for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) { - delete *cc; + (*cc)->Unregister(); } if (SeqTerm) { - delete SeqTerm; + SeqTerm->Unregister(); } } @@ -195,10 +218,53 @@ unsigned int SeqEntry::GetNumberOfSQItems() return Items.size(); } +/** + * \brief Sets the Sequence Delimitation Item + * \param e Delimitation item + */ +void SeqEntry::SetDelimitationItem(DocEntry *e) +{ + if( SeqTerm != e ) + { + if( SeqTerm ) + SeqTerm->Unregister(); + SeqTerm = e; + if( SeqTerm ) + SeqTerm->Register(); + } +} + +/** + * \brief Copies all the attributes from an other DocEntry + * @param doc entry to copy from + * @remarks The contained SQItems a not copied, only referenced + */ +void SeqEntry::Copy(DocEntry *doc) +{ + // Delete previous SQ items + ClearSQItem(); + + DocEntry::Copy(doc); + SeqEntry *entry = dynamic_cast(doc); + if ( entry ) + { + DelimitorMode = entry->DelimitorMode; + SQDepthLevel = entry->SQDepthLevel; + + SeqTerm = entry->SeqTerm; + if(SeqTerm) + SeqTerm->Register(); + Items = entry->Items; + for(ItSQItem = Items.begin();ItSQItem != Items.end(); ++ItSQItem) + { + (*ItSQItem)->Register(); + } + } +} + //----------------------------------------------------------------------------- // Protected - //----------------------------------------------------------------------------- // Private @@ -209,8 +275,9 @@ unsigned int SeqEntry::GetNumberOfSQItems() */ void SeqEntry::Print( std::ostream &os, std::string const & ) { - // First, Print the Dicom Element itself. - os << "S "; + // os << "S "; + + // First, Print the common part (vr [length offset] name). DocEntry::Print(os); os << std::endl; @@ -227,10 +294,12 @@ void SeqEntry::Print( std::ostream &os, std::string const & ) // at end, print the sequence terminator item, if any if (DelimitorMode) { - for ( int i = 0; i < SQDepthLevel; i++ ) - { + int i; + for ( i = 0; i < SQDepthLevel; i++ ) + os << " | " ; + os << " --- " << std::endl; + for ( i = 0; i < SQDepthLevel; i++ ) os << " | " ; - } if (SeqTerm != NULL) { SeqTerm->SetPrintLevel(PrintLevel); @@ -240,7 +309,7 @@ void SeqEntry::Print( std::ostream &os, std::string const & ) else { // fuse - gdcmVerboseMacro(" -------- should have a sequence terminator item"); + gdcmWarningMacro(" -------- should have a sequence terminator item"); } } }