X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=6a9a13ce201aa4ba3c7f86cf0a8a449bacb574e4;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=172a6a7a09c60d09c2e1ce47ea1fbcc2e6cb62cd;hpb=7f60a4b9128ff289c532360928c7ecc4bbdad61d;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 172a6a7a..6a9a13ce 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/06/07 13:44:47 $ - Version: $Revision: 1.57 $ + Date: $Date: 2005/11/03 08:47:51 $ + Version: $Revision: 1.77 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,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, ...) */ @@ -72,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; @@ -92,24 +115,25 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) 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 ); + binary_write(*fp, vr.str()); - if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") ) + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ ) +// FIXME : what is the status of VR = "UN" +// --> uncomment or remove comment ! { - binary_write(*fp, z); + binary_write(*fp, zero); if (vr == "SQ") { // we set SQ length to ffffffff @@ -130,6 +154,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else // IMPLICIT VR { +// ----------- Writes the common part : the VR if (vr == "SQ") { binary_write(*fp, ffff); @@ -175,6 +200,15 @@ 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) @@ -205,7 +239,7 @@ 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 */ @@ -214,54 +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 = " ffff "; s.setf(std::ios::left); - s << std::setw(10-st.size()); - s << " ffff "; + 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(); }