Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/09/21 09:44:59 $
- Version: $Revision: 1.69 $
+ Date: $Date: 2006/07/06 12:38:06 $
+ Version: $Revision: 1.85 $
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"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
-
+#include "gdcmDictSet.h"
#include <iomanip> // for std::ios::left, ...
#include <fstream>
// Constructor / Destructor
/**
* \brief Constructor from a given DictEntry
- * @param in Pointer to existing dictionary entry
+ * @param group Group number
+ * @param elem Element number
+ * @param vr VR
*/
-DocEntry::DocEntry(DictEntry *in)
+DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr)
{
ImplicitVR = false;
- DicomDict = in;
- SetKey( in->GetKey( ) );
+ DicomDict = 0;
Offset = 0 ; // To avoid further missprinting
// init some variables
ReadLength = 0;
Length = 0;
+
+ VR = vr;
+ Key.SetGroupElem(group,elem);
+}
+
+/**
+ * \brief Destructor from a given DictEntry
+ */
+DocEntry::~DocEntry()
+{
+ if (DicomDict)
+ {
+ 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
// Dicom V3 group 0x0002 is *always* Explicit VR !
- if ( filetype == ExplicitVR || group == 0x0002 )
+ if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || 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.
//
binary_write(*fp, ff);
return;
}
-
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 );
-
- 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, zero);
- if (vr == "SQ")
+ if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010)
+ {
+ gdcmAssertMacro( GetVR() == "OW" );
+ binary_write(*fp, ffff);
+ }
+ else if (vr == "SQ")
{
// we set SQ length to ffffffff
// and we shall write a Sequence Delimitor Item
}
else // IMPLICIT VR
{
+// ----------- Writes the common part : the VR
if (vr == "SQ")
{
binary_write(*fp, ffff);
}
}
+/// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom
+/// Dictionnary of the current Dicom Header Entry
+std::string const &DocEntry::GetName()
+{
+ if (DicomDict == 0)
+ DicomDict =
+ Global::GetDicts()->GetDefaultPubDict()->GetEntry(Key[0],Key[1]);
+ if (DicomDict == 0)
+ return GDCM_UNKNOWN;
+ else
+ {
+ DicomDict->Register();
+ return DicomDict->GetName();
+ }
+}
+
+ /// \brief Returns the 'Value Multiplicity' (e.g. "1", "6", "1-n", "3-n"),
+ /// found in the Dicom entry or in the Dicom Dictionnary
+ /// of the current Dicom entry
+std::string const &DocEntry::GetVM()
+{
+ if (DicomDict == 0)
+ DicomDict =
+ Global::GetDicts()->GetDefaultPubDict()->GetEntry(Key[0],Key[1]);
+ if (DicomDict == 0)
+ return GDCM_UNKNOWN;
+ else
+ {
+ DicomDict->Register();
+ return DicomDict->GetVM();
+ }
+}
+
/**
* \brief Gets the full length of the elementary DocEntry (not only value
* length) depending on the VR.
}
/**
- * \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());
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff