Program: gdcm
Module: $RCSfile: gdcmSeqEntry.cxx,v $
Language: C++
- Date: $Date: 2004/09/16 19:21:57 $
- Version: $Revision: 1.28 $
+ 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
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include "gdcmTS.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
#include <iostream>
#include <iomanip>
+#include <fstream>
+
+namespace gdcm
+{
+
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup gdcmSeqEntry
- * \brief Constructor from a given gdcmSeqEntry
+ * \brief Constructor from a given SeqEntry
*/
-gdcmSeqEntry::gdcmSeqEntry( gdcmDictEntry* e )
- : gdcmDocEntry(e)
+SeqEntry::SeqEntry( DictEntry *e )
+ : DocEntry(e)
{
- UsableLength = 0;
- ReadLength = 0xffffffff;
+ Length = 0;
+ ReadLength = 0xffffffff;
SQDepthLevel = -1;
- delimitor_mode = false;
- seq_term = NULL;
+ DelimitorMode = false;
+ SeqTerm = NULL;
}
/**
- * \brief Constructor from a given gdcmSeqEntry
+ * \brief Constructor from a given SeqEntry
* @param e Pointer to existing Doc entry
* @param depth depth level of the current Seq entry
*/
-gdcmSeqEntry::gdcmSeqEntry( gdcmDocEntry* e, int depth )
- : gdcmDocEntry( e->GetDictEntry() )
+SeqEntry::SeqEntry( DocEntry *e, int depth )
+ : DocEntry( e->GetDictEntry() )
{
- this->UsableLength = 0;
- this->ReadLength = 0xffffffff;
+ Length = 0;
+ ReadLength = 0xffffffff;
SQDepthLevel = depth;
- this->ImplicitVR = e->IsImplicitVR();
- this->Offset = e->GetOffset();
+ ImplicitVR = e->IsImplicitVR();
+ Offset = e->GetOffset();
+ SeqTerm = NULL;
}
/**
* \brief Canonical destructor.
*/
-gdcmSeqEntry::~gdcmSeqEntry() {
- for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+SeqEntry::~SeqEntry()
+{
+ for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
{
delete *cc;
}
- if (!seq_term)
- delete seq_term;
+ if (SeqTerm)
+ {
+ delete SeqTerm;
+ }
}
/**
* \brief canonical Printer
*/
-void gdcmSeqEntry::Print( std::ostream &os )
+void SeqEntry::Print( std::ostream &os, std::string const & )
{
// First, Print the Dicom Element itself.
- SetPrintLevel(2);
- gdcmDocEntry::Print(os);
+ 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)
+ 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 (delimitor_mode) {
+ if (DelimitorMode)
+ {
for ( int i = 0; i < SQDepthLevel; i++ )
{
os << " | " ;
}
- if (seq_term != NULL)
+ if (SeqTerm != NULL)
{
- seq_term->Print(os);
+ 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 gdcmSeqEntry::Write(FILE *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;
- gdcmDocEntry::Write(fp, filetype);
- for(ListSQItem::iterator cc = GetSQItems().begin();
- cc != GetSQItems().end();
+ 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
// because we wrote the Sequence as a 'no Length' sequence
- fwrite ( &seq_term_gr,(size_t)2 ,(size_t)1 ,fp);
- fwrite ( &seq_term_el,(size_t)2 ,(size_t)1 ,fp);
- fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp);
+ binary_write(*fp, seq_term_gr);
+ binary_write(*fp, seq_term_el);
+ binary_write(*fp, seq_term_lg);
}
//-----------------------------------------------------------------------------
// Public
/// \brief adds the passed ITEM to the ITEM chained List for this SeQuence.
-void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem, int itemNumber)
+void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
{
sqItem->SetSQItemNumber(itemNumber);
- items.push_back(sqItem);
+ Items.push_back(sqItem);
}
/**
* Returns the last item when argument is bigget than the total
* item number.
*/
-gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb)
+SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
{
if (nb<0)
- return (*(items.begin()));
+ {
+ return *(Items.begin());
+ }
int count = 0 ;
- for(ListSQItem::iterator cc = items.begin();
- cc != items.end();
- count ++, ++cc){
- if (count==nb)
+ for(ListSQItem::iterator cc = Items.begin();
+ cc != Items.end();
+ count ++, ++cc)
+ {
+ if (count == nb)
+ {
return *cc;
+ }
}
- return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME
+ return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
}
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
+} // end namespace gdcm
+