X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=1e7555f33c69b91937aabd067119881fccf22928;hb=78752094d50bd649537833a854fc6f5d7765bdf0;hp=4b91fc3543e96f60461619ec9e4a17b47929b832;hpb=cf3aa95de5677cb2520c6b5b36516c968450b54a;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 4b91fc35..1e7555f3 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2005/12/21 14:52:12 $ - Version: $Revision: 1.80 $ + Date: $Date: 2006/07/06 16:57:06 $ + Version: $Revision: 1.86 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,7 +23,7 @@ #include "gdcmGlobal.h" #include "gdcmUtil.h" #include "gdcmDebug.h" - +#include "gdcmDictSet.h" #include // for std::ios::left, ... #include @@ -34,20 +34,22 @@ namespace gdcm // 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; + DicomDict = 0; Offset = 0 ; // To avoid further missprinting // init some variables ReadLength = 0; Length = 0; - gdcmAssertMacro(DicomDict); - DicomDict->Register(); + VR = vr; + Key.SetGroupElem(group,elem); } /** @@ -55,9 +57,11 @@ DocEntry::DocEntry(DictEntry *in) */ DocEntry::~DocEntry() { - gdcmAssertMacro(DicomDict); - - DicomDict->Unregister(); + if (DicomDict) + { + gdcmAssertMacro(DicomDict); + DicomDict->Unregister(); + } } //----------------------------------------------------------------------------- @@ -71,13 +75,13 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) { uint32_t ffff = 0xffffffff; uint16_t group = GetGroup(); - + ///\todo allow skipping Shadow groups - + VRKey vr = GetVR(); uint16_t elem = GetElement(); uint32_t lgth = GetLength(); - + if ( group == 0xfffe && elem == 0x0000 ) { // Fix in order to make some MR PHILIPS images e-film readable @@ -85,7 +89,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) // we just *always* ignore spurious fffe|0000 tag ! return; } - + // // ----------- Writes the common part // @@ -99,14 +103,13 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) binary_write( *fp, elem); //element number // Dicom V3 group 0x0002 is *always* Explicit VR ! - if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 ) + if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || group == 0x0002 ) { - // ----------- Writes the common part : the VR + the length - // Special case of delimiters: + // Special case of delimiters: if (group == 0xfffe) - { + { // Delimiters have NO Value Representation // Hence we skip writing the VR. // @@ -119,7 +122,6 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) binary_write(*fp, ff); return; } - uint16_t zero = 0; uint16_t shortLgr = (uint16_t)lgth; @@ -127,19 +129,22 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) { // 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.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 @@ -171,6 +176,39 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } } +/// \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. @@ -196,33 +234,6 @@ uint32_t DocEntry::GetFullLength() return l; } -/** - * \brief tells us if entry is the last one of a 'no length' SequenceItem - * (fffe,e00d) - */ -bool DocEntry::IsItemDelimitor() -{ - return (GetGroup() == 0xfffe && GetElement() == 0xe00d); -} - -/** - * \brief tells us if entry is the first one of an Item - * (fffe,e000) - */ -bool DocEntry::IsItemStarter() -{ - return (GetGroup() == 0xfffe && GetElement() == 0xe000); -} - -/** - * \brief tells us if entry is the last one of a 'no length' Sequence - * (fffe,e0dd) - */ -bool DocEntry::IsSequenceDelimitor() -{ - return (GetGroup() == 0xfffe && GetElement() == 0xe0dd); -} - /** * \brief Copies all the attributes from an other DocEntry * @param doc entry to copy from