Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/08/25 13:12:43 $
- Version: $Revision: 1.64 $
+ Date: $Date: 2006/02/16 20:06:14 $
+ Version: $Revision: 1.81 $
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 "gdcmDataEntry.h"
#include "gdcmTS.h"
#include "gdcmVR.h"
#include "gdcmGlobal.h"
{
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, ...)
*/
{
uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
+
+ ///\todo allow skipping Shadow groups
+
VRKey vr = GetVR();
- uint16_t el = GetElement();
+ uint16_t elem = GetElement();
uint32_t lgth = GetLength();
- if ( group == 0xfffe && el == 0x0000 )
+ if ( group == 0xfffe && elem == 0x0000 )
{
// Fix in order to make some MR PHILIPS images e-film readable
// see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
// we just *always* ignore spurious fffe|0000 tag !
return;
}
+
//
// ----------- 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
+ binary_write( *fp, elem); //element number
- if ( filetype == ExplicitVR )
+ // Dicom V3 group 0x0002 is *always* Explicit VR !
+ if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
{
+// ----------- Writes the common part : the VR + the length
+
// Special case of delimiters:
if (group == 0xfffe)
{
// Delimiters have NO Value Representation
// 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)
- // We shall force the end of a given Item by writting
+ // We shall force the end of a given SeqItem by writting
// a Item Delimitation Item (fffe, e00d)
uint32_t ff = 0xffffffff;
return;
}
- uint16_t z = 0;
+ uint16_t zero = 0;
uint16_t shortLgr = (uint16_t)lgth;
- if (vr == GDCM_UNKNOWN)
+ if( IsVRUnknown() )
{
- // Unknown was 'written'
- // deal with Little Endian
- binary_write(*fp, shortLgr);
- binary_write(*fp, z);
+ // GDCM_VRUNKNOWN was stored in the Entry VR;
+ // deal with Entry as if TS were Implicit VR
+
+ binary_write(*fp, lgth);
}
else
{
- binary_write(*fp, vr);
- gdcmAssertMacro( vr.size() == 2 );
-
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
+ binary_write(*fp, vr.str());
+
+ // See PS 3.5-2004 page 33, 36
+ if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF")
+ || (vr == "UN") || (vr == "UT") )
{
- binary_write(*fp, z);
+ binary_write(*fp, zero);
if (vr == "SQ")
{
// we set SQ length to ffffffff
}
else // IMPLICIT VR
{
+// ----------- Writes the common part : the VR
if (vr == "SQ")
{
binary_write(*fp, ffff);
}
/**
- * \brief Copies all the attributes from an other DocEntry
+ * \brief Copies all the attributes from an other DocEntry
* @param doc entry to copy from
*/
void DocEntry::Copy(DocEntry *doc)
//-----------------------------------------------------------------------------
// 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());
if (PrintLevel >= 2)
{
s << " lg : ";
- lgth = GetReadLength(); // ReadLength, as opposed to Length
+ lgth = GetReadLength(); // ReadLength, as opposed to (usable) Length
if (lgth == 0xffffffff)
{
st = " ffff ";
s.setf(std::ios::left);
s << std::setw(4);
- s << " x(ffff) ";
+ s << " x(ffff) ";
s.setf(std::ios::left);
s << std::setw(8) << "-1";
}
{
st = Util::Format("x(%x)",lgth); // we may keep it
s.setf(std::ios::left);
- s << std::setw(10-st.size()) << " ";
+ s << std::setw(11-st.size()) << " ";
s << st << " ";
s.setf(std::ios::left);
s << std::setw(8) << lgth;
}
s << " Off.: ";
st = Util::Format("x(%x)",o); // we may keep it
- s << std::setw(10-st.size()) << " ";
+ s << std::setw(11-st.size()) << " ";
s << st << " ";
s << std::setw(8) << o;
}
+ if (PrintLevel >= 1)
+ s << " ";
s << "[" << vr << "] ";
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff