Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/09/21 09:44:59 $
- Version: $Revision: 1.69 $
+ Date: $Date: 2005/11/03 08:47:51 $
+ Version: $Revision: 1.77 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
ImplicitVR = false;
DicomDict = in;
- SetKey( in->GetKey( ) );
Offset = 0 ; // To avoid further missprinting
// init some variables
ReadLength = 0;
Length = 0;
+
+ gdcmAssertMacro(DicomDict);
+ DicomDict->Register();
+}
+
+/**
+ * \brief Destructor from a given DictEntry
+ */
+DocEntry::~DocEntry()
+{
+ gdcmAssertMacro(DicomDict);
+
+ DicomDict->Unregister();
}
//-----------------------------------------------------------------------------
// Public
/**
- * \brief Writes the common part of any ValEntry, BinEntry, SeqEntry
+ * \brief Writes the common part of any DataEntry, SeqEntry
* @param fp already open ofstream pointer
* @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
//
// ----------- Writes the common part
//
+ // To avoid gdcm to propagate oddities.
+ // --> Don't forget to *write* an even length value
+ if (lgth%2)
+ lgth ++;
+
+ // ----------- Writes the common part : the Tag
binary_write( *fp, group); //group number
binary_write( *fp, el); //element number
// Dicom V3 group 0x0002 is *always* Explicit VR !
- if ( filetype == ExplicitVR || group == 0x0002 )
+ if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
{
- // Special case of delimiters:
+
+// ----------- Writes the common part : the VR + the length
+
+ // Special case of delimiters:
if (group == 0xfffe)
{
// Delimiters have NO Value Representation
uint16_t zero = 0;
uint16_t shortLgr = (uint16_t)lgth;
- if (vr == GDCM_UNKNOWN)
+ if( IsVRUnknown() )
{
- // GDCM_UNKNOWN was stored in the Entry VR;
+ // GDCM_VRUNKNOWN was stored in the Entry VR;
// deal with Entry as if TS were Implicit VR
- // FIXME : troubles expected on big endian processors :
- // let lgth = 0x00001234
- // we write 34 12 00 00 on little endian proc (OK)
- // we write 12 34 00 00 on big endian proc (KO)
- //binary_write(*fp, shortLgr);
- //binary_write(*fp, zero);
-
binary_write(*fp, lgth);
}
else
{
- binary_write(*fp, vr);
- gdcmAssertMacro( vr.size() == 2 );
+ binary_write(*fp, vr.str());
if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
+// FIXME : what is the status of VR = "UN"
+// --> uncomment or remove comment !
{
binary_write(*fp, zero);
if (vr == "SQ")
}
else // IMPLICIT VR
{
+// ----------- Writes the common part : the VR
if (vr == "SQ")
{
binary_write(*fp, ffff);
//-----------------------------------------------------------------------------
// Print
/**
- * \brief Prints the common part of ValEntry, BinEntry, SeqEntry
+ * \brief Prints the common part of DataEntry, SeqEntry
* @param os ostream we want to print in
* @param indent Indentation string to be prepended during printing
*/
size_t o;
std::string st;
TSKey v;
- std::string d2, vr;
+ std::string d2;
+ VRKey vr;
std::ostringstream s;
uint32_t lgth;
o = GetOffset();
vr = GetVR();
- if ( vr==GDCM_UNKNOWN )
- vr=" ";
+ if ( vr == GDCM_VRUNKNOWN )
+ vr = " ";
s << DictEntry::TranslateToKey(GetGroup(),GetElement());