X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSeqEntry.cxx;h=1962d89fbf0244bde1f7683aba3580c369de4400;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=8ece4978a456d8d7a8526cee5e8b061a7d65e5de;hpb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 8ece4978..1962d89f 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:11 $ - Version: $Revision: 1.38 $ + Date: $Date: 2005/01/06 20:03:28 $ + Version: $Revision: 1.41 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -35,7 +35,7 @@ namespace gdcm * \ingroup SeqEntry * \brief Constructor from a given SeqEntry */ -SeqEntry::SeqEntry( DictEntry* e ) +SeqEntry::SeqEntry( DictEntry *e ) : DocEntry(e) { UsableLength = 0; @@ -51,7 +51,7 @@ SeqEntry::SeqEntry( DictEntry* e ) * @param e Pointer to existing Doc entry * @param depth depth level of the current Seq entry */ -SeqEntry::SeqEntry( DocEntry* e, int depth ) +SeqEntry::SeqEntry( DocEntry *e, int depth ) : DocEntry( e->GetDictEntry() ) { UsableLength = 0; @@ -72,7 +72,7 @@ SeqEntry::~SeqEntry() { delete *cc; } - if (!SeqTerm) + if (SeqTerm) { delete SeqTerm; } @@ -84,8 +84,6 @@ SeqEntry::~SeqEntry() void SeqEntry::Print( std::ostream &os ) { // First, Print the Dicom Element itself. - SetPrintLevel(2); - os << "S "; DocEntry::Print(os); os << std::endl; @@ -96,6 +94,7 @@ void SeqEntry::Print( std::ostream &os ) // Then, Print each SQ Item for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) { + (*cc)->SetPrintLevel(PrintLevel); (*cc)->Print(os); } @@ -108,6 +107,7 @@ void SeqEntry::Print( std::ostream &os ) } if (SeqTerm != NULL) { + SeqTerm->SetPrintLevel(PrintLevel); SeqTerm->Print(os); os << std::endl; } @@ -122,7 +122,7 @@ void SeqEntry::Print( std::ostream &os ) /* * \brief canonical Writer */ -void SeqEntry::WriteContent(std::ofstream* fp, FileType filetype) +void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) { uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; @@ -162,7 +162,7 @@ void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber) * Returns the last item when argument is bigget than the total * item number. */ -SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb) +SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb) { if (nb<0) {