X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocEntry.cxx;h=e82e2100c8dd2c6ad8d2e94884ca3ebcccb681d9;hb=0ad9dae4659b21bfd5c834c1af724eab4dcdf4f6;hp=5b1a9f3bc530d230a319e6d6645b58f300d57e3b;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 5b1a9f3b..e82e2100 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/07/02 13:55:27 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/01/23 10:12:33 $ + Version: $Revision: 1.45 $ 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,10 +18,16 @@ #include "gdcmDocEntry.h" #include "gdcmTS.h" +#include "gdcmVR.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include // for std::ios::left, ... +#include + +namespace gdcm +{ // CLEAN ME #define MAX_SIZE_PRINT_ELEMENT_VALUE 64 @@ -29,70 +35,77 @@ //----------------------------------------------------------------------------- // 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 + + // init some variables + ReadLength = 0; + Length = 0; } //----------------------------------------------------------------------------- // Print /** - * \ingroup gdcmDocEntry - * \brief Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry + * \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 gdcmDocEntry::Print(std::ostream & os) { - - printLevel=2; // FIXME - +void DocEntry::Print(std::ostream &os, std::string const & ) +{ size_t o; - unsigned short int g, e; - char st[20]; + std::string st; TSKey v; std::string d2, vr; std::ostringstream s; uint32_t lgth; - char greltag[10]; //group element tag - 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)" ! + 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-strlen(st)) << " "; + s << std::setw(10-st.size()) << " "; s << st << " "; s.setf(std::ios::left); - s << std::setw(8) << "-1"; - } else { - sprintf(st,"x(%x)",lgth); + s << std::setw(8) << "-1"; + } + else + { + st = Util::Format("x(%x)",lgth); s.setf(std::ios::left); - s << std::setw(10-strlen(st)) << " "; + s << std::setw(10-st.size()) << " "; 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)) << " "; + st = Util::Format("x(%x)",o); + s << std::setw(10-st.size()) << " "; s << st << " "; s << std::setw(8) << o; } s << "[" << vr << "] "; - if (printLevel>=1) { + if (PrintLevel >= 1) + { s.setf(std::ios::left); s << std::setw(66-GetName().length()) << " "; } @@ -102,33 +115,37 @@ void gdcmDocEntry::Print(std::ostream & os) { } /** - * \ingroup gdcmDocEntry - * \brief Writes the common part of any 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 to be written */ -void gdcmDocEntry::Write(FILE *fp, FileType filetype) { - - uint32_t FFFF = 0xffffffff; +void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ + uint32_t ffff = 0xffffffff; uint16_t group = GetGroup(); - gdcmVRKey vr = GetVR(); + VRKey vr = GetVR(); uint16_t el = GetElement(); - uint32_t lgr = GetReadLength(); + uint32_t lgr = GetLength(); - if ( (group == 0xfffe) && (el == 0x0000) ) + 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; + return; + } -// -// ----------- 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 ) { + // + // ----------- Writes the common part + // + binary_write( *fp, group); //group + binary_write( *fp, el); //element + if ( filetype == ExplicitVR ) + { // Special case of delimiters: - if (group == 0xfffe) { + 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 @@ -137,46 +154,59 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype) { // - 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 + // 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 z = 0; uint16_t shortLgr = lgr; - if (vr == "unkn") { // Unknown was 'written' + if (vr == GDCM_UNKNOWN) + { + // 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); - } else { - fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,fp); + 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") ) { - fwrite ( &z, (size_t)2 ,(size_t)1 ,fp); - 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); - } else { - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,fp); + 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, lgr); } - } else { - fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,fp); + } + else + { + binary_write(*fp, shortLgr); } } } else // IMPLICIT VR { - if (vr == "SQ") { - fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp); - } else { - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,fp); - } + if (vr == "SQ") + { + binary_write(*fp, ffff); + } + else + { + binary_write(*fp, lgr); + } } } @@ -184,57 +214,57 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype) { // 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(void) { - uint32_t 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 + * @param e entry to copy from */ -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 +void DocEntry::Copy(DocEntry *e) +{ + Length = e->Length; + ReadLength = e->ReadLength; + ImplicitVR = e->ImplicitVR; + Offset = e->Offset; } /** - * \ingroup gdcmDocEntry * \brief tells us if entry is the last one of a 'no length' SequenceItem * (fffe,e00d) */ -bool gdcmDocEntry::isItemDelimitor() { - if ( (GetGroup() == 0xfffe) && (GetElement() == 0xe00d) ) - return true; - else - return false; +bool DocEntry::IsItemDelimitor() +{ + return (GetGroup() == 0xfffe && GetElement() == 0xe00d); } /** - * \ingroup gdcmDocEntry * \brief tells us if entry is the last one of a 'no length' Sequence * (fffe,e0dd) */ -bool gdcmDocEntry::isSequenceDelimitor() { - if (GetGroup() == 0xfffe && GetElement() == 0xe0dd) - return true; - else - return false; +bool DocEntry::IsSequenceDelimitor() +{ + return (GetGroup() == 0xfffe && GetElement() == 0xe0dd); } //----------------------------------------------------------------------------- @@ -245,3 +275,5 @@ bool gdcmDocEntry::isSequenceDelimitor() { // Private //----------------------------------------------------------------------------- + +} // end namespace gdcm