X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=afb8f04a515072ca148d6fad9b493338f14ac566;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=feadac76014a59750648d2d726136533ce882010;hpb=1ce6ae86daabc8b64c9309acce4ecf137ee79f07;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index feadac76..afb8f04a 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/01/31 12:19:34 $ - Version: $Revision: 1.51 $ + Date: $Date: 2007/09/14 08:22:19 $ + Version: $Revision: 1.71 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,16 +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; @@ -47,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; @@ -68,57 +70,7 @@ SeqEntry::SeqEntry( DocEntry *e, int depth ) */ SeqEntry::~SeqEntry() { - for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) - { - delete *cc; - } - if (SeqTerm) - { - delete SeqTerm; - } -} - -//----------------------------------------------------------------------------- -// Print -/** - * \brief canonical Printer - */ -void SeqEntry::Print( std::ostream &os, std::string const & ) -{ - // First, Print the Dicom Element itself. - os << "S "; - DocEntry::Print(os); - os << std::endl; - - if (GetReadLength() == 0) - return; - - // Then, Print each SQ Item - for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) - { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); - } - - // at end, print the sequence terminator item, if any - if (DelimitorMode) - { - for ( int i = 0; i < SQDepthLevel; i++ ) - { - os << " | " ; - } - if (SeqTerm != NULL) - { - SeqTerm->SetPrintLevel(PrintLevel); - SeqTerm->Print(os); - os << std::endl; - } - else - { - // fuse - gdcmVerboseMacro(" -------- should have a sequence terminator item"); - } - } + ClearSQItem(); } //----------------------------------------------------------------------------- @@ -128,21 +80,23 @@ void SeqEntry::Print( std::ostream &os, std::string const & ) * @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 dummy, bool dummy2) { 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 @@ -152,6 +106,56 @@ 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 + * @param itemNumber ordinal number of the SQItem + * \note NOT end-user intendend method ! + */ +void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber) +{ +// FIXME : SQItemNumber is supposed to be the ordinal number of the SQItem +// within the Sequence. +// Either only 'push_back' is allowed, +// and we just have to do something like SeqEntry::lastNb++ +// Or we can add (or remove) anywhere, and SQItemNumber will be broken + sqItem->SetSQItemNumber(itemNumber); + Items.push_back(sqItem); + sqItem->Register(); +} + +/** + * \brief Remove all SQItem. + */ +void SeqEntry::ClearSQItem() +{ + for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) + { + (*cc)->Unregister(); + } + if (SeqTerm) + { + SeqTerm->Unregister(); + } +} + /** * \brief Get the first entry while visiting the SeqEntry * \return The first SQItem if found, otherwhise NULL @@ -206,34 +210,109 @@ SQItem *SeqEntry::GetSQItem(int nb) return *(Items.end()); } -/// \brief returns the number of SQItems within the current Sequence +/** + * \brief returns the number of SQItems within the current Sequence + */ unsigned int SeqEntry::GetNumberOfSQItems() { return Items.size(); } -/// \brief adds the passed ITEM to the ITEM chained List for this SeQuence. -/// @param sqItem SQItem to be pushed back in the SeqEntry -/// @param itemNumber ordinal number of the SQItem -/// \note NOT end-user intendend method ! -void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber) +/** + * \brief Sets the Sequence Delimitation Item + * \param e Delimitation item + */ +void SeqEntry::SetDelimitationItem(DocEntry *e) { -// FIXME : SQItemNumber is supposed to be the ordinal number of the SQItem -// within the Sequence. -// Either only 'push_back' is allowed, -// and we just have to do something like SeqEntry::lastNb++ -// Or we can add (or remove) anywhere, and SQItemNumber will be broken - sqItem->SetSQItemNumber(itemNumber); - Items.push_back(sqItem); + 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 //----------------------------------------------------------------------------- -} // end namespace gdcm +// Print +/** + * \brief canonical Printer + */ +void SeqEntry::Print( std::ostream &os, std::string const & ) +{ + // os << "S "; + + // First, Print the common part (vr [length offset] name). + DocEntry::Print(os); + os << std::endl; + + if (GetReadLength() == 0) + return; + + // Then, Print each SQ Item + for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); + } + + // at end, print the sequence terminator item, if any + if (DelimitorMode) + { + 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); + SeqTerm->Print(os); + os << std::endl; + } + else + { + // fuse + gdcmWarningMacro(" -------- should have a sequence terminator item"); + } + } +} +//----------------------------------------------------------------------------- +} // end namespace gdcm