X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=a1526820e5dca991408c68b9f4ee87c4e1b38cba;hb=8ba6105c39056bba295025f4b46d2cdf24dab792;hp=c8e5b4baa328e4057b3f83aa7d39c1a9646e9ec4;hpb=b616acd3a7a3dc34524e9f2482d70b25a6e1beff;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index c8e5b4ba..a1526820 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/01/26 09:49:53 $ - Version: $Revision: 1.47 $ + Date: $Date: 2005/08/28 16:57:36 $ + Version: $Revision: 1.65 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,11 +28,8 @@ namespace gdcm { - -// CLEAN ME -#define MAX_SIZE_PRINT_ELEMENT_VALUE 64 - //----------------------------------------------------------------------------- + // Constructor / Destructor /** * \brief Constructor from a given DictEntry @@ -51,69 +48,7 @@ DocEntry::DocEntry(DictEntry *in) } //----------------------------------------------------------------------------- -// Print -/** - * \brief Prints the common part of ValEntry, BinEntry, SeqEntry - * @param os ostream we want to print in - * @param indent Indentation string to be prepended during printing - */ -void DocEntry::Print(std::ostream &os, std::string const & ) -{ - size_t o; - std::string st; - TSKey v; - std::string d2, vr; - std::ostringstream s; - uint32_t lgth; - - o = GetOffset(); - vr = GetVR(); - if(vr==GDCM_UNKNOWN) - vr=" "; - - s << DictEntry::TranslateToKey(GetGroup(),GetElement()); - - if (PrintLevel >= 2) - { - s << " lg : "; - lgth = GetReadLength(); // ReadLength, as opposed to Length - if (lgth == 0xffffffff) - { - st = Util::Format("x(ffff)"); // I said : "x(ffff)" ! - s.setf(std::ios::left); - s << std::setw(10-st.size()) << " "; - s << st << " "; - s.setf(std::ios::left); - s << std::setw(8) << "-1"; - } - else - { - st = Util::Format("x(%x)",lgth); - s.setf(std::ios::left); - s << std::setw(10-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()) << " "; - s << st << " "; - s << std::setw(8) << o; - } - - s << "[" << vr << "] "; - - if (PrintLevel >= 1) - { - s.setf(std::ios::left); - s << std::setw(66-GetName().length()) << " "; - } - - s << "[" << GetName()<< "]"; - os << s.str(); -} - +// Public /** * \brief Writes the common part of any ValEntry, BinEntry, SeqEntry * @param fp already open ofstream pointer @@ -123,9 +58,9 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) { uint32_t ffff = 0xffffffff; uint16_t group = GetGroup(); - VRKey vr = GetVR(); + VRKey vr = GetVR(); uint16_t el = GetElement(); - uint32_t lgr = GetLength(); + uint32_t lgth = GetLength(); if ( group == 0xfffe && el == 0x0000 ) { @@ -134,12 +69,11 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) // we just *always* ignore spurious fffe|0000 tag ! return; } - // // ----------- Writes the common part // - binary_write( *fp, group); //group - binary_write( *fp, el); //element + binary_write( *fp, group); //group number + binary_write( *fp, el); //element number if ( filetype == ExplicitVR ) { @@ -159,7 +93,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } uint16_t z = 0; - uint16_t shortLgr = lgr; + uint16_t shortLgr = (uint16_t)lgth; if (vr == GDCM_UNKNOWN) { @@ -185,7 +119,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } else @@ -202,14 +136,11 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } } -//----------------------------------------------------------------------------- -// Public - /** * \brief Gets the full length of the elementary DocEntry (not only value * length) depending on the VR. @@ -236,25 +167,23 @@ uint32_t DocEntry::GetFullLength() } /** - * \brief Copies all the attributes from an other DocEntry - * @param e entry to copy from + * \brief tells us if entry is the last one of a 'no length' SequenceItem + * (fffe,e00d) */ -void DocEntry::Copy(DocEntry *e) +bool DocEntry::IsItemDelimitor() { - Length = e->Length; - ReadLength = e->ReadLength; - ImplicitVR = e->ImplicitVR; - Offset = e->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); } + /** * \brief tells us if entry is the last one of a 'no length' Sequence * (fffe,e0dd) @@ -264,13 +193,93 @@ 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 - //----------------------------------------------------------------------------- // Private //----------------------------------------------------------------------------- +// Print +/** + * \brief Prints the common part of ValEntry, BinEntry, SeqEntry + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing + */ +void DocEntry::Print(std::ostream &os, std::string const & ) +{ + size_t o; + std::string st; + TSKey v; + std::string d2, vr; + std::ostringstream s; + uint32_t lgth; + o = GetOffset(); + vr = GetVR(); + if ( vr==GDCM_UNKNOWN ) + vr=" "; + + s << DictEntry::TranslateToKey(GetGroup(),GetElement()); + + if (PrintLevel >= 2) + { + s << " lg : "; + lgth = GetReadLength(); // ReadLength, as opposed to Length + if (lgth == 0xffffffff) + { + st = " ffff "; + s.setf(std::ios::left); + s << std::setw(4); + s << " x(ffff) "; + s.setf(std::ios::left); + s << std::setw(8) << "-1"; + } + else + { + st = Util::Format("x(%x)",lgth); // we may keep it + s.setf(std::ios::left); + 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); // we may keep it + s << std::setw(11-st.size()) << " "; + s << st << " "; + s << std::setw(8) << o; + } + + 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-name.length()) << " "; + } + + s << "[" << name << "]"; + os << s.str(); +} + +//----------------------------------------------------------------------------- } // end namespace gdcm