Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2004/10/22 03:05:41 $
- Version: $Revision: 1.28 $
+ 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 "gdcmDocEntry.h"
#include "gdcmTS.h"
+#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;
SetKey( in->GetKey( ) );
Offset = 0 ; // To avoid further missprinting
+
+ // init some variables
+ ReadLength = 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 & )
{
- PrintLevel = 2; // FIXME
-
size_t o;
- unsigned short int g, e;
std::string st;
TSKey v;
std::string d2, vr;
std::ostringstream s;
uint32_t lgth;
- g = GetGroup();
- e = GetElement();
o = GetOffset();
vr = GetVR();
+ if(vr==GDCM_UNKNOWN)
+ vr=" ";
s << DictEntry::TranslateToKey(GetGroup(),GetElement());
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::Write(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 )
{
//
// ----------- Writes the common part
//
- fp->write ((char*) &group,(size_t)2 ); //group
- fp->write ( (char*)&el, (size_t)2 ); //element
-
+ binary_write( *fp, group); //group
+ binary_write( *fp, el); //element
+
if ( filetype == ExplicitVR )
{
// Special case of delimiters:
// 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)
+ // We shall force the end of a given Item by writting
+ // a Item Delimitation Item (fffe, e00d)
- // TODO : verify if the Sequence Delimitor Item was forced during Parsing
-
- int ff = 0xffffffff;
- fp->write ((char*)&ff,(size_t)4 );
+ uint32_t ff = 0xffffffff;
+ binary_write(*fp, ff);
return;
}
uint16_t z = 0;
uint16_t shortLgr = lgr;
- if (vr == "unkn")
+ if (vr == GDCM_UNKNOWN)
{
// Unknown was 'written'
// deal with Little Endian
- fp->write ( (char*)&shortLgr,(size_t)2 );
- fp->write ( (char*)&z, (size_t)2 );
+ binary_write(*fp, shortLgr);
+ binary_write(*fp, z);
}
else
{
- fp->write (vr.c_str(),(size_t)2 );
-
+ binary_write(*fp, vr);
+ gdcmAssertMacro( vr.size() == 2 );
if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
{
- fp->write ( (char*)&z, (size_t)2 );
+ binary_write(*fp, z);
if (vr == "SQ")
{
// we set SQ length to ffffffff
// and we shall write a Sequence Delimitor Item
// at the end of the Sequence!
- fp->write ( (char*)&ffff,(size_t)4 );
+ binary_write(*fp, ffff);
}
else
{
- fp->write ( (char*)&lgr,(size_t)4 );
+ binary_write(*fp, lgr);
}
}
else
{
- fp->write ( (char*)&shortLgr,(size_t)2 );
+ binary_write(*fp, shortLgr);
}
}
}
{
if (vr == "SQ")
{
- fp->write ( (char*)&ffff,(size_t)4 );
+ binary_write(*fp, ffff);
}
else
{
- fp->write ( (char*)&lgr,(size_t)4 );
+ binary_write(*fp, lgr);
}
}
}
// 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;
- PrintLevel = e->PrintLevel;
- // 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)
*/