X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=a4011aa731b0fef048e8ec408ef6087f498088b4;hb=bd1e1aea88a95e4d14cd59088a7e5280703402ea;hp=5f313486e8e6065d719c6daaaca6605c57ba9bf6;hpb=44a9814938a6824d3a66b932429084517da6dadf;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 5f313486..a4011aa7 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/09/13 12:10:53 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/10/18 19:54:26 $ + Version: $Revision: 1.72 $ 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,109 +18,49 @@ #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; - DictEntry = in; + DicomDict = in; SetKey( in->GetKey( ) ); Offset = 0 ; // To avoid further missprinting -} - -//----------------------------------------------------------------------------- -// Print -/** - * \ingroup gdcmDocEntry - * \brief Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry - * @param os ostream we want to print in - */ -void gdcmDocEntry::Print(std::ostream & os) -{ - PrintLevel = 2; // FIXME - - size_t o; - unsigned short int g, e; - char st[20]; - TSKey v; - std::string d2, vr; - std::ostringstream s; - uint32_t lgth; - - g = GetGroup(); - e = GetElement(); - o = GetOffset(); - vr = GetVR(); - - s << GetKey(); - - 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; - } - s << " Off.: "; - sprintf(st,"x(%x)",o); - s << std::setw(10-strlen(st)) << " "; - 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(); + // init some variables + ReadLength = 0; + Length = 0; } +//----------------------------------------------------------------------------- +// Public /** - * \ingroup gdcmDocEntry - * \brief Writes the common part of any gdcmValEntry, gdcmBinEntry, gdcmSeqEntry - * @param fp already open file pointer - * @param filetype type of the file to be written + * \brief Writes the common part of any DataEntry, SeqEntry + * @param fp already open ofstream pointer + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ -void gdcmDocEntry::Write(FILE *fp, FileType filetype) +void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) { - uint32_t FFFF = 0xffffffff; + uint32_t ffff = 0xffffffff; uint16_t group = GetGroup(); - gdcmVRKey vr = GetVR(); + VRKey vr = GetVR(); uint16_t el = GetElement(); - uint32_t lgr = GetReadLength(); + uint32_t lgth = GetLength(); if ( group == 0xfffe && el == 0x0000 ) { @@ -129,65 +69,70 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype) // 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 -// -// ----------- Writes the common part -// - fwrite ( &group,(size_t)2 ,(size_t)1 ,fp); //group - fwrite ( &el, (size_t)2 ,(size_t)1 ,fp); //element - - if ( filetype == gdcmExplicitVR ) + // Dicom V3 group 0x0002 is *always* Explicit VR ! + if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 ) { // 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) - // 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) + // We shall force the end of a given SeqItem by writting + // a Item Delimitation Item (fffe, e00d) - // TODO : verify if the Sequence Delimitor Item was forced during Parsing - - int ff = 0xffffffff; - fwrite (&ff,(size_t)4 ,(size_t)1 ,fp); + uint32_t ff = 0xffffffff; + binary_write(*fp, ff); return; } - uint16_t z = 0; - uint16_t shortLgr = lgr; + uint16_t zero = 0; + uint16_t shortLgr = (uint16_t)lgth; - if (vr == "unkn") + if( IsVRUnknown() ) { - // Unknown was 'written' - // deal with Little Endian - fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,fp); - fwrite ( &z, (size_t)2 ,(size_t)1 ,fp); + // GDCM_VRUNKNOWN was stored in the Entry VR; + // deal with Entry as if TS were Implicit VR + + // FIXME : troubles expected on big endian processors : + // let lgth = 0x00001234 + // we write 34 12 00 00 on little endian proc (OK) + // we write 12 34 00 00 on big endian proc (KO) + //binary_write(*fp, shortLgr); + //binary_write(*fp, zero); + + binary_write(*fp, lgth); } else { - fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,fp); + binary_write(*fp, vr.str()); - if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") ) + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ ) { - fwrite ( &z, (size_t)2 ,(size_t)1 ,fp); + binary_write(*fp, zero); if (vr == "SQ") { // we set SQ length to ffffffff // and we shall write a Sequence Delimitor Item // at the end of the Sequence! - fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp); + binary_write(*fp, ffff); } else { - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,fp); + binary_write(*fp, lgth); } } else { - fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,fp); + binary_write(*fp, shortLgr); } } } @@ -195,23 +140,20 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype) { if (vr == "SQ") { - fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp); + binary_write(*fp, ffff); } else { - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,fp); + binary_write(*fp, lgth); } } } -//----------------------------------------------------------------------------- -// 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. */ -uint32_t gdcmDocEntry::GetFullLength() +uint32_t DocEntry::GetFullLength() { uint32_t l = GetReadLength(); if ( IsImplicitVR() ) @@ -233,44 +175,122 @@ uint32_t gdcmDocEntry::GetFullLength() } /** - * \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) +bool DocEntry::IsItemDelimitor() { - DictEntry = e->DictEntry; - UsableLength = e->UsableLength; - ReadLength = e->ReadLength; - ImplicitVR = e->ImplicitVR; - Offset = e->Offset; - PrintLevel = e->PrintLevel; - // TODO : remove gdcmDocEntry SQDepth + return (GetGroup() == 0xfffe && GetElement() == 0xe00d); } /** - * \ingroup gdcmDocEntry - * \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 gdcmDocEntry::IsItemDelimitor() +bool DocEntry::IsItemStarter() { - return (GetGroup() == 0xfffe && GetElement() == 0xe00d); + return (GetGroup() == 0xfffe && GetElement() == 0xe000); } + /** - * \ingroup gdcmDocEntry * \brief tells us if entry is the last one of a 'no length' Sequence * (fffe,e0dd) */ -bool gdcmDocEntry::IsSequenceDelimitor() +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 DataEntry, 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; + VRKey vr; + std::ostringstream s; + uint32_t lgth; + + o = GetOffset(); + vr = GetVR(); + if ( vr == GDCM_VRUNKNOWN ) + vr=" "; + + s << DictEntry::TranslateToKey(GetGroup(),GetElement()); + + if (PrintLevel >= 2) + { + s << " lg : "; + lgth = GetReadLength(); // ReadLength, as opposed to (usable) 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; + } + 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-name.length()) << " "; + } + + s << "[" << name << "]"; + os << s.str(); +} + +//----------------------------------------------------------------------------- +} // end namespace gdcm