X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=8c750d71769c2ba7b3ed59466d8b3afcde4d8a25;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=5fcc597f4853aac48d47d0a8fab56bb741d5a538;hpb=4dd42f8153a4d5ea8d2524b3c6670e80232f73b4;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 5fcc597f..8c750d71 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2004/10/09 03:31:26 $ - Version: $Revision: 1.25 $ + Date: $Date: 2005/01/06 20:03:27 $ + Version: $Revision: 1.38 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,10 +18,15 @@ #include "gdcmDocEntry.h" #include "gdcmTS.h" +#include "gdcmVR.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" #include // for std::ios::left, ... +#include + +namespace gdcm +{ // CLEAN ME #define MAX_SIZE_PRINT_ELEMENT_VALUE 64 @@ -29,43 +34,44 @@ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDocEntry - * \brief Constructor from a given gdcmDictEntry + * \ingroup DocEntry + * \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 + + // init some variables + ReadLength = 0; + UsableLength = 0; } //----------------------------------------------------------------------------- // Print /** - * \ingroup gdcmDocEntry - * \brief Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry + * \ingroup DocEntry + * \brief Prints the common part of ValEntry, BinEntry, SeqEntry * @param os ostream we want to print in */ -void gdcmDocEntry::Print(std::ostream& os) +void DocEntry::Print(std::ostream &os) { - PrintLevel = 2; // FIXME - size_t o; - unsigned short int g, e; std::string st; TSKey v; std::string d2, vr; std::ostringstream s; uint32_t lgth; - g = GetGroup(); - e = GetElement(); o = GetOffset(); vr = GetVR(); + if(vr==GDCM_UNKNOWN) + vr=" "; - s << gdcmDictEntry::TranslateToKey(GetGroup(),GetElement()); + s << DictEntry::TranslateToKey(GetGroup(),GetElement()); if (PrintLevel >= 2) { @@ -73,7 +79,7 @@ void gdcmDocEntry::Print(std::ostream& os) lgth = GetReadLength(); // ReadLength, as opposed to UsableLength if (lgth == 0xffffffff) { - st = Format("x(ffff)"); // I said : "x(ffff)" ! + st = Util::Format("x(ffff)"); // I said : "x(ffff)" ! s.setf(std::ios::left); s << std::setw(10-st.size()) << " "; s << st << " "; @@ -82,7 +88,7 @@ void gdcmDocEntry::Print(std::ostream& os) } else { - st = Format("x(%x)",lgth); + st = Util::Format("x(%x)",lgth); s.setf(std::ios::left); s << std::setw(10-st.size()) << " "; s << st << " "; @@ -90,7 +96,7 @@ void gdcmDocEntry::Print(std::ostream& os) s << std::setw(8) << lgth; } s << " Off.: "; - st = Format("x(%x)",o); + st = Util::Format("x(%x)",o); s << std::setw(10-st.size()) << " "; s << st << " "; s << std::setw(8) << o; @@ -109,16 +115,16 @@ void gdcmDocEntry::Print(std::ostream& os) } /** - * \ingroup gdcmDocEntry - * \brief Writes the common part of any gdcmValEntry, gdcmBinEntry, gdcmSeqEntry + * \ingroup DocEntry + * \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 */ -void gdcmDocEntry::Write(FILE* fp, FileType filetype) +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(); @@ -133,10 +139,10 @@ void gdcmDocEntry::Write(FILE* fp, FileType filetype) // // ----------- 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 ) + binary_write( *fp, group); //group + binary_write( *fp, el); //element + + if ( filetype == ExplicitVR ) { // Special case of delimiters: if (group == 0xfffe) @@ -151,43 +157,44 @@ void gdcmDocEntry::Write(FILE* fp, FileType filetype) // 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; - if (vr == "unkn") + 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); + binary_write(*fp, shortLgr); + binary_write(*fp, z); } else { - fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,fp); + binary_write(*fp, vr); + assert( vr.size() == 2 ); if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") ) { - fwrite ( &z, (size_t)2 ,(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! - 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, lgr); } } else { - fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,fp); + binary_write(*fp, shortLgr); } } } @@ -195,11 +202,11 @@ 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, lgr); } } } @@ -208,11 +215,11 @@ void gdcmDocEntry::Write(FILE* fp, FileType filetype) // Public /** - * \ingroup gdcmDocEntry + * \ingroup DocEntry * \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() ) @@ -234,35 +241,34 @@ uint32_t gdcmDocEntry::GetFullLength() } /** - * \ingroup gdcmDocEntry + * \ingroup DocEntry * \brief Copies all the attributes from an other DocEntry */ -void gdcmDocEntry::Copy (gdcmDocEntry* e) +void DocEntry::Copy (DocEntry *e) { - DictEntry = e->DictEntry; +// DicomDict = e->DicomDict; UsableLength = e->UsableLength; ReadLength = e->ReadLength; ImplicitVR = e->ImplicitVR; Offset = e->Offset; - PrintLevel = e->PrintLevel; - // TODO : remove gdcmDocEntry SQDepth + // TODO : remove DocEntry SQDepth } /** - * \ingroup gdcmDocEntry + * \ingroup DocEntry * \brief tells us if entry is the last one of a 'no length' SequenceItem * (fffe,e00d) */ -bool gdcmDocEntry::IsItemDelimitor() +bool DocEntry::IsItemDelimitor() { return (GetGroup() == 0xfffe && GetElement() == 0xe00d); } /** - * \ingroup gdcmDocEntry + * \ingroup DocEntry * \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); } @@ -275,3 +281,5 @@ bool gdcmDocEntry::IsSequenceDelimitor() // Private //----------------------------------------------------------------------------- + +} // end namespace gdcm