X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=6224b551b049469b671de3a294bd18da5a1c871f;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=75b832796edd6507b153bee3c9c85af8bf9f7e2f;hpb=a891240601e102b6b07ce593d9b9b28948149e72;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 75b83279..6224b551 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/18 14:28:32 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/04/19 09:58:19 $ + Version: $Revision: 1.55 $ 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,81 +48,19 @@ 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 file pointer - * @param filetype type of the file to be written + * @param fp already open ofstream pointer + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ 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 ) { @@ -150,11 +84,8 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) // 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) - // The end of a given Item will be found when : - // - a new Item Delimitor Item is encountered (the Seq goes on) - // - a Sequence Delimitor Item is encountered (the Seq just ended) - - // TODO : verify if the Sequence Delimitor Item was forced during Parsing + // We shall force the end of a given Item by writting + // a Item Delimitation Item (fffe, e00d) uint32_t ff = 0xffffffff; binary_write(*fp, ff); @@ -162,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) { @@ -188,7 +119,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } else @@ -205,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. @@ -238,18 +166,6 @@ uint32_t DocEntry::GetFullLength() return l; } -/** - * \brief Copies all the attributes from an other DocEntry - * @param e entry to copy from - */ -void DocEntry::Copy (DocEntry *e) -{ - Length = e->Length; - ReadLength = e->ReadLength; - ImplicitVR = e->ImplicitVR; - Offset = e->Offset; -} - /** * \brief tells us if entry is the last one of a 'no length' SequenceItem * (fffe,e00d) @@ -258,6 +174,7 @@ bool DocEntry::IsItemDelimitor() { return (GetGroup() == 0xfffe && GetElement() == 0xe00d); } + /** * \brief tells us if entry is the last one of a 'no length' Sequence * (fffe,e0dd) @@ -267,13 +184,87 @@ 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 = 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(); +} +//----------------------------------------------------------------------------- } // end namespace gdcm