Program: gdcm
Module: $RCSfile: gdcmSeqEntry.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 10:29:56 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2005/08/24 03:42:40 $
+ Version: $Revision: 1.57 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSeqEntry.h"
#include "gdcmSQItem.h"
+#include "gdcmValEntry.h"
#include "gdcmTS.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
}
/**
- * \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()
{
- for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
- {
- delete *cc;
- }
- if (SeqTerm)
- {
- delete SeqTerm;
- }
+ ClearSQItem();
}
//-----------------------------------------------------------------------------
binary_write(*fp, seq_term_lg);
}
+/**
+ * \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);
+}
+
+/**
+ * \brief Remove all SQItem.
+ */
+void SeqEntry::ClearSQItem()
+{
+ for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
+ {
+ delete *cc;
+ }
+ if (SeqTerm)
+ {
+ delete SeqTerm;
+ }
+}
+
/**
* \brief Get the first entry while visiting the SeqEntry
* \return The first SQItem if found, otherwhise NULL
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)
-{
-// 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);
-}
-
//-----------------------------------------------------------------------------
// Protected
// 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);
else
{
// fuse
- gdcmVerboseMacro(" -------- should have a sequence terminator item");
+ gdcmWarningMacro(" -------- should have a sequence terminator item");
}
}
}