X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=747a1479b3370de7ca792caef152d77de03e98bf;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=4b91fc3543e96f60461619ec9e4a17b47929b832;hpb=cf3aa95de5677cb2520c6b5b36516c968450b54a;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 4b91fc35..747a1479 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: 2007/10/30 09:14:42 $ + Version: $Revision: 1.96 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,41 +23,45 @@ #include "gdcmGlobal.h" #include "gdcmUtil.h" #include "gdcmDebug.h" - +#include "gdcmDictSet.h" #include // for std::ios::left, ... #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Constructor from a given DictEntry - * @param in Pointer to existing dictionary entry + * \brief Constructor from a given DocEntry + * @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; - Offset = 0 ; // To avoid further missprinting + DicomDict = 0; + Offset = 0 ; // To avoid further misprinting // init some variables ReadLength = 0; Length = 0; - gdcmAssertMacro(DicomDict); - DicomDict->Register(); + VR = vr; + Key.SetGroupElem(group,elem); } /** - * \brief Destructor from a given DictEntry + * \brief Destructor from a given DocEntry */ DocEntry::~DocEntry() { - gdcmAssertMacro(DicomDict); - - DicomDict->Unregister(); + if (DicomDict) + { + gdcmAssertMacro(DicomDict); + DicomDict->Unregister(); + } } //----------------------------------------------------------------------------- @@ -65,19 +69,19 @@ DocEntry::~DocEntry() /** * \brief Writes the common part of any DataEntry, SeqEntry * @param fp already open ofstream pointer - * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, JPEG, JPEG2000...) */ -void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) +void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMetaElements, bool insideSequence) { 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 && insideMetaElements) ) { - // ----------- 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,27 +122,30 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) binary_write(*fp, ff); return; } - uint16_t zero = 0; uint16_t shortLgr = (uint16_t)lgth; - if( IsVRUnknown() ) - { - // GDCM_VRUNKNOWN was stored in the Entry VR; - // deal with Entry as if TS were Implicit VR - - binary_write(*fp, lgth); - } - else + if( IsVRUnknown() ) { + // if VR was not set by user, we set it to "UN" + SetVR("UN"); + vr=GetVR(); + } + + //{ binary_write(*fp, vr.str()); - // See PS 3.5-2004 page 33, 36 - if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") + if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OL") || (vr == "OF") || (vr == "UN") || (vr == "UT") ) { binary_write(*fp, zero); - if (vr == "SQ") + + if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010 && !insideSequence) + { + // Only the 'true' Pixel Element may be compressed (hope so!) + binary_write(*fp, ffff); + } + else if (vr == "SQ") { // we set SQ length to ffffffff // and we shall write a Sequence Delimitor Item @@ -155,7 +161,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) { binary_write(*fp, shortLgr); } - } + //} } else // IMPLICIT VR { @@ -171,6 +177,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. @@ -184,7 +223,7 @@ uint32_t DocEntry::GetFullLength() } else { - if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="SQ" ) + if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="OL" || GetVR()=="SQ" ) { l = l + 12; // 2 (gr) + 2 (el) + 2 (vr) + 2 (unused) + 4 (lgth) } @@ -196,33 +235,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 @@ -244,7 +256,7 @@ void DocEntry::Copy(DocEntry *doc) //----------------------------------------------------------------------------- // Print /** - * \brief Prints the common part of DataEntry, SeqEntry + * \brief Prints the common part (vr [length offset] name) of DataEntry, SeqEntry * @param os ostream we want to print in * @param indent Indentation string to be prepended during printing */ @@ -293,17 +305,31 @@ void DocEntry::Print(std::ostream &os, std::string const & ) s << st << " "; s << std::setw(8) << o; } - if (PrintLevel >= 1) + //if (PrintLevel >= 1) s << " "; s << "[" << vr << "] "; std::string name; - if ( GetElement() == 0x0000 ) + uint16_t e = GetElement(); + if ( e == 0x0000 ) name = "Group Length"; + else if ( GetGroup()%2 == 1 ) + { + if ( e >= 0x0010 && e <= 0x00ff ) + name = "Private Creator"; + else if (e == 0x0001) + name = "Private Group Length To End"; + } else + { name = GetName(); - + // prevent Print from any CR at end of name (hope it's enought!) + if (name[name.length()-1] == 0x0d || name[name.length()-1] == 0x0a) + { + name.replace(name.length()-1, 1, 1, ' '); + } + } if (PrintLevel >= 1) { s.setf(std::ios::left);