Program: gdcm
Module: $RCSfile: gdcmSeqEntry.cxx,v $
Language: C++
- Date: $Date: 2004/11/19 12:44:00 $
- Version: $Revision: 1.36 $
+ Date: $Date: 2005/01/18 08:01:42 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmTS.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
#include <iostream>
#include <iomanip>
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup SeqEntry
* \brief Constructor from a given SeqEntry
*/
-SeqEntry::SeqEntry( DictEntry* e )
+SeqEntry::SeqEntry( DictEntry *e )
: DocEntry(e)
{
- UsableLength = 0;
- ReadLength = 0xffffffff;
+ Length = 0;
+ ReadLength = 0xffffffff;
SQDepthLevel = -1;
DelimitorMode = false;
* @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;
+ Length = 0;
ReadLength = 0xffffffff;
SQDepthLevel = depth;
{
delete *cc;
}
- if (!SeqTerm)
+ if (SeqTerm)
{
delete SeqTerm;
}
/**
* \brief canonical Printer
*/
-void SeqEntry::Print( std::ostream &os )
+void SeqEntry::Print( std::ostream &os, std::string const & )
{
// First, Print the Dicom Element itself.
- SetPrintLevel(2);
+ os << "S ";
DocEntry::Print(os);
os << std::endl;
// Then, Print each SQ Item
for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
{
+ (*cc)->SetPrintLevel(PrintLevel);
(*cc)->Print(os);
}
}
if (SeqTerm != NULL)
{
+ SeqTerm->SetPrintLevel(PrintLevel);
SeqTerm->Print(os);
os << std::endl;
}
else
{
// fuse
- os << " -------------- should have a sequence terminator item";
+ gdcmVerboseMacro(" -------- should have a sequence terminator item");
}
}
}
/*
* \brief canonical Writer
*/
-void SeqEntry::Write(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;
//uint16_t item_term_gr = 0xfffe;
//uint16_t item_term_el = 0xe00d;
- DocEntry::Write(fp, filetype);
+ DocEntry::WriteContent(fp, filetype);
for(ListSQItem::iterator cc = Items.begin();
cc != Items.end();
++cc)
{
- (*cc)->Write(fp, filetype);
+ (*cc)->WriteContent(fp, filetype);
}
// we force the writting of a Sequence Delimitation item
* 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)
{