X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=6224b551b049469b671de3a294bd18da5a1c871f;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=0afb302f29365000ad3a1f872ad36d6393af9bbe;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 0afb302f..6224b551 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2004/06/20 18:08:47 $ - Version: $Revision: 1.7 $ + 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 - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -18,160 +18,253 @@ #include "gdcmDocEntry.h" #include "gdcmTS.h" +#include "gdcmVR.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include // for std::ios::left, ... +#include -// CLEAN ME -#define MAX_SIZE_PRINT_ELEMENT_VALUE 64 - +namespace gdcm +{ //----------------------------------------------------------------------------- + // Constructor / Destructor /** - * \ingroup gdcmDocEntry - * \brief Constructor from a given gdcmDictEntry + * \brief Constructor from a given DictEntry * @param in Pointer to existing dictionary entry */ -gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in) { +DocEntry::DocEntry(DictEntry *in) +{ ImplicitVR = false; - entry = in; -} + DicomDict = in; + SetKey( in->GetKey( ) ); + Offset = 0 ; // To avoid further missprinting -/** - * \ingroup gdcmDocEntry - * \brief Canonical Printer - * @param os ostream we want to print in - */ -void gdcmDocEntry::Print(std::ostream & os) { - std::ostringstream s; - s << std::endl; - PrintCommonPart(os); - os << s.str(); + // init some variables + ReadLength = 0; + Length = 0; } //----------------------------------------------------------------------------- -// Print +// Public /** - * \ingroup gdcmDocEntry - * \brief Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry + * \brief Writes the common part of any ValEntry, BinEntry, SeqEntry + * @param fp already open ofstream pointer + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ -void gdcmDocEntry::PrintCommonPart(std::ostream & os) { +void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ + uint32_t ffff = 0xffffffff; + uint16_t group = GetGroup(); + VRKey vr = GetVR(); + uint16_t el = GetElement(); + uint32_t lgth = GetLength(); - printLevel=2; // FIXME - - size_t o; - unsigned short int g, e; - char st[20]; - TSKey v; - std::string d2, vr; - std::ostringstream s; - guint32 lgth; - char greltag[10]; //group element tag + if ( group == 0xfffe && el == 0x0000 ) + { + // Fix in order to make some MR PHILIPS images e-film readable + // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm: + // we just *always* ignore spurious fffe|0000 tag ! + return; + } + // + // ----------- Writes the common part + // + binary_write( *fp, group); //group number + binary_write( *fp, el); //element number - g = GetGroup(); - e = GetElement(); - o = GetOffset(); - vr = GetVR(); - sprintf(greltag,"%04x|%04x ",g,e); - s << greltag ; - - if (printLevel>=2) { - s << "lg : "; - lgth = GetReadLength(); // ReadLength, as opposed to UsableLength - if (lgth == 0xffffffff) { - sprintf(st,"x(ffff)"); // I said : "x(ffff)" ! - s.setf(std::ios::left); - s << std::setw(10-strlen(st)) << " "; - s << st << " "; - s.setf(std::ios::left); - s << std::setw(8) << "-1"; - } else { - sprintf(st,"x(%x)",lgth); - s.setf(std::ios::left); - s << std::setw(10-strlen(st)) << " "; - s << st << " "; - s.setf(std::ios::left); - s << std::setw(8) << lgth; + if ( filetype == ExplicitVR ) + { + // 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 + // a Item Delimitation Item (fffe, e00d) + + uint32_t ff = 0xffffffff; + binary_write(*fp, ff); + return; } - s << " Off.: "; - sprintf(st,"x(%x)",o); - s << std::setw(10-strlen(st)) << " "; - s << st << " "; - s << std::setw(8) << o; - } - s << "[" << vr << "] "; + uint16_t z = 0; + uint16_t shortLgr = (uint16_t)lgth; - if (printLevel>=1) { - s.setf(std::ios::left); - s << std::setw(66-GetName().length()) << " "; + if (vr == GDCM_UNKNOWN) + { + // Unknown was 'written' + // deal with Little Endian + binary_write(*fp, shortLgr); + binary_write(*fp, z); + } + else + { + binary_write(*fp, vr); + gdcmAssertMacro( vr.size() == 2 ); + + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") ) + { + binary_write(*fp, z); + if (vr == "SQ") + { + // we set SQ length to ffffffff + // and we shall write a Sequence Delimitor Item + // at the end of the Sequence! + binary_write(*fp, ffff); + } + else + { + binary_write(*fp, lgth); + } + } + else + { + binary_write(*fp, shortLgr); + } + } + } + else // IMPLICIT VR + { + if (vr == "SQ") + { + binary_write(*fp, ffff); + } + else + { + binary_write(*fp, lgth); + } } - - s << "[" << GetName()<< "]"; - os << s.str(); } -//----------------------------------------------------------------------------- -// Public - /** - * \ingroup gdcmDocEntry - * \brief Gets the full length of the elementary DocEntry (not only value length) + * \brief Gets the full length of the elementary DocEntry (not only value + * length) depending on the VR. */ -guint32 gdcmDocEntry::GetFullLength(void) { - guint32 l; - l = GetReadLength(); - if ( IsImplicitVR() ) +uint32_t DocEntry::GetFullLength() +{ + uint32_t l = GetReadLength(); + if ( IsImplicitVR() ) + { l = l + 8; // 2 (gr) + 2 (el) + 4 (lgth) - else + } + else + { if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="SQ" ) + { l = l + 12; // 2 (gr) + 2 (el) + 2 (vr) + 2 (unused) + 4 (lgth) + } else + { l = l + 8; // 2 (gr) + 2 (el) + 2 (vr) + 2 (lgth) - return(l); + } + } + return l; } /** - * \ingroup gdcmDocEntry - * \brief Copies all the attributes from an other DocEntry + * \brief tells us if entry is the last one of a 'no length' SequenceItem + * (fffe,e00d) */ -void gdcmDocEntry::Copy (gdcmDocEntry* e) { - this->entry = e->entry; - this->UsableLength = e->UsableLength; - this->ReadLength = e->ReadLength; - this->ImplicitVR = e->ImplicitVR; - this->Offset = e->Offset; - this->printLevel = e->printLevel; - // TODO : remove gdcmDocEntry SQDepth +bool DocEntry::IsItemDelimitor() +{ + return (GetGroup() == 0xfffe && GetElement() == 0xe00d); } /** - * \ingroup gdcmDocEntry - * \brief tells us if entry is the first one of a Sequence Item (fffe,e00d) + * \brief tells us if entry is the last one of a 'no length' Sequence + * (fffe,e0dd) */ -bool gdcmDocEntry::isItemDelimitor() { - if ( (GetGroup() == 0xfffe) && (GetElement() == 0xe00d) ) - return true; - else - return false; +bool DocEntry::IsSequenceDelimitor() +{ + return (GetGroup() == 0xfffe && GetElement() == 0xe0dd); } + /** - * \ingroup gdcmDocEntry - * \brief tells us if entry is the last one of a 'no length' Sequence fffe,e0dd) + * \brief Copies all the attributes from an other DocEntry + * @param doc entry to copy from */ -bool gdcmDocEntry::isSequenceDelimitor() { - if (GetGroup() == 0xfffe && GetElement() == 0xe0dd) - return true; - else - return false; +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