Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 13:35:38 $
- Version: $Revision: 1.37 $
+ Date: $Date: 2005/01/26 09:49:53 $
+ Version: $Revision: 1.47 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmVR.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
#include <iomanip> // for std::ios::left, ...
#include <fstream>
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup DocEntry
* \brief Constructor from a given DictEntry
* @param in Pointer to existing dictionary entry
*/
-DocEntry::DocEntry(DictEntry* in)
+DocEntry::DocEntry(DictEntry *in)
{
ImplicitVR = false;
DicomDict = in;
// init some variables
ReadLength = 0;
- UsableLength = 0;
+ Length = 0;
}
//-----------------------------------------------------------------------------
// Print
/**
- * \ingroup DocEntry
* \brief Prints the common part of ValEntry, BinEntry, SeqEntry
* @param os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
*/
-void DocEntry::Print(std::ostream& os)
+void DocEntry::Print(std::ostream &os, std::string const & )
{
size_t o;
std::string st;
if (PrintLevel >= 2)
{
s << " lg : ";
- lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
+ lgth = GetReadLength(); // ReadLength, as opposed to Length
if (lgth == 0xffffffff)
{
st = Util::Format("x(ffff)"); // I said : "x(ffff)" !
}
/**
- * \ingroup DocEntry
* \brief Writes the common part of any ValEntry, BinEntry, SeqEntry
- * @param fp already open file pointer
- * @param filetype type of the file to be written
+ * @param fp already open ofstream pointer
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
-void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
+void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
VRKey vr = GetVR();
uint16_t el = GetElement();
- uint32_t lgr = GetReadLength();
+ uint32_t lgr = GetLength();
if ( group == 0xfffe && el == 0x0000 )
{
// Hence we skip writing the VR.
// In order to avoid further troubles, we choose to write them
// as 'no-length' Item Delimitors (we pad by writing 0xffffffff)
- // The end of a given Item will be found when :
- // - a new Item Delimitor Item is encountered (the Seq goes on)
- // - a Sequence Delimitor Item is encountered (the Seq just ended)
-
- // TODO : verify if the Sequence Delimitor Item was forced during Parsing
+ // We shall force the end of a given Item by writting
+ // a Item Delimitation Item (fffe, e00d)
uint32_t ff = 0xffffffff;
binary_write(*fp, ff);
else
{
binary_write(*fp, vr);
- assert( vr.size() == 2 );
+ gdcmAssertMacro( vr.size() == 2 );
if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
{
// Public
/**
- * \ingroup DocEntry
* \brief Gets the full length of the elementary DocEntry (not only value
* length) depending on the VR.
*/
}
/**
- * \ingroup DocEntry
* \brief Copies all the attributes from an other DocEntry
+ * @param e entry to copy from
*/
-void DocEntry::Copy (DocEntry* e)
+void DocEntry::Copy(DocEntry *e)
{
-// DicomDict = e->DicomDict;
- UsableLength = e->UsableLength;
- ReadLength = e->ReadLength;
- ImplicitVR = e->ImplicitVR;
- Offset = e->Offset;
- // TODO : remove DocEntry SQDepth
+ Length = e->Length;
+ ReadLength = e->ReadLength;
+ ImplicitVR = e->ImplicitVR;
+ Offset = e->Offset;
}
/**
- * \ingroup DocEntry
* \brief tells us if entry is the last one of a 'no length' SequenceItem
* (fffe,e00d)
*/
return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
}
/**
- * \ingroup DocEntry
* \brief tells us if entry is the last one of a 'no length' Sequence
* (fffe,e0dd)
*/