X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=f343fb60846218253972b1bf4c0bbb6c83e622b0;hb=17daf7e7caceddf44e73864ee8d366613a1f0c82;hp=3e218c41968260f8c01ffb1a2c64f84eea4f7f05;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 3e218c41..f343fb60 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/02/02 10:02:17 $ - Version: $Revision: 1.51 $ + Date: $Date: 2005/11/29 12:48:46 $ + Version: $Revision: 1.79 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -29,9 +29,7 @@ namespace gdcm { //----------------------------------------------------------------------------- -#define MAX_SIZE_PRINT_ELEMENT_VALUE 64 -//----------------------------------------------------------------------------- // Constructor / Destructor /** * \brief Constructor from a given DictEntry @@ -41,18 +39,30 @@ DocEntry::DocEntry(DictEntry *in) { 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, ...) */ @@ -62,7 +72,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) uint16_t group = GetGroup(); VRKey vr = GetVR(); uint16_t el = GetElement(); - uint32_t lgr = GetLength(); + uint32_t lgth = GetLength(); if ( group == 0xfffe && el == 0x0000 ) { @@ -74,19 +84,30 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) // // ----------- 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 - if ( filetype == ExplicitVR ) + // Dicom V3 group 0x0002 is *always* Explicit VR ! + 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 // 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; @@ -94,24 +115,25 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) return; } - uint16_t z = 0; - uint16_t shortLgr = lgr; + 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 @@ -121,7 +143,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } else @@ -132,13 +154,14 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else // IMPLICIT VR { +// ----------- Writes the common part : the VR if (vr == "SQ") { binary_write(*fp, ffff); } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } } @@ -169,24 +192,21 @@ uint32_t DocEntry::GetFullLength() } /** - * \brief Copies all the attributes from an other DocEntry - * @param doc entry to copy from + * \brief tells us if entry is the last one of a 'no length' SequenceItem + * (fffe,e00d) */ -void DocEntry::Copy(DocEntry *doc) +bool DocEntry::IsItemDelimitor() { - Length = doc->Length; - ReadLength = doc->ReadLength; - ImplicitVR = doc->ImplicitVR; - Offset = doc->Offset; + return (GetGroup() == 0xfffe && GetElement() == 0xe00d); } /** - * \brief tells us if entry is the last one of a 'no length' SequenceItem - * (fffe,e00d) + * \brief tells us if entry is the first one of an Item + * (fffe,e000) */ -bool DocEntry::IsItemDelimitor() +bool DocEntry::IsItemStarter() { - return (GetGroup() == 0xfffe && GetElement() == 0xe00d); + return (GetGroup() == 0xfffe && GetElement() == 0xe000); } /** @@ -198,6 +218,18 @@ bool DocEntry::IsSequenceDelimitor() return (GetGroup() == 0xfffe && GetElement() == 0xe0dd); } +/** + * \brief Copies all the attributes from an other DocEntry + * @param doc entry to copy from + */ +void DocEntry::Copy(DocEntry *doc) +{ + Length = doc->Length; + ReadLength = doc->ReadLength; + ImplicitVR = doc->ImplicitVR; + Offset = doc->Offset; +} + //----------------------------------------------------------------------------- // Protected @@ -207,7 +239,7 @@ bool DocEntry::IsSequenceDelimitor() //----------------------------------------------------------------------------- // 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 */ @@ -216,55 +248,64 @@ void DocEntry::Print(std::ostream &os, std::string const & ) 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 = Util::Format("x(ffff)"); // I said : "x(ffff)" ! + st = " ffff "; s.setf(std::ios::left); - s << std::setw(10-st.size()) << " "; - s << st << " "; + s << std::setw(4); + s << " x(ffff) "; s.setf(std::ios::left); s << std::setw(8) << "-1"; } else { - st = Util::Format("x(%x)",lgth); + 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); - s << std::setw(10-st.size()) << " "; + st = Util::Format("x(%x)",o); // we may keep it + s << std::setw(11-st.size()) << " "; s << st << " "; s << std::setw(8) << o; } + if (PrintLevel >= 1) + s << " "; s << "[" << vr << "] "; + std::string name; + if ( GetElement() == 0x0000 ) + name = "Group Length"; + else + name = GetName(); + if (PrintLevel >= 1) { s.setf(std::ios::left); - s << std::setw(66-GetName().length()) << " "; + s << std::setw(66-name.length()) << " "; } - s << "[" << GetName()<< "]"; + s << "[" << name << "]"; os << s.str(); }