X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=03f1d679e9b85fb83f9cf63d416eb56efbe2a862;hb=dfd2b1cd2925e77ef9466cfb2fc71706c84a418c;hp=9f337bdea15fef6f9fd84aaef8bdbbfaeb3872ce;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 9f337bde..03f1d679 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:42 $ - Version: $Revision: 1.31 $ + Date: $Date: 2005/01/25 16:32:45 $ + Version: $Revision: 1.52 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,9 +17,11 @@ =========================================================================*/ #include "gdcmValEntry.h" +#include "gdcmVR.h" #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include @@ -35,7 +37,7 @@ namespace gdcm * \brief Constructor from a given DictEntry * @param e Pointer to existing dictionary entry */ -ValEntry::ValEntry(DictEntry* e) : DocEntry(e) +ValEntry::ValEntry(DictEntry *e) : ContentEntry(e) { } @@ -43,14 +45,10 @@ ValEntry::ValEntry(DictEntry* e) : DocEntry(e) * \brief Constructor from a given DocEntry * @param e Pointer to existing Doc entry */ -ValEntry::ValEntry(DocEntry* e) - : DocEntry(e->GetDictEntry()) +ValEntry::ValEntry(DocEntry *e) + : ContentEntry(e->GetDictEntry()) { - UsableLength = e->GetLength(); - ReadLength = e->GetReadLength(); - ImplicitVR = e->IsImplicitVR(); - Offset = e->GetOffset(); - PrintLevel = e->GetPrintLevel(); + Copy(e); } @@ -64,21 +62,23 @@ ValEntry::~ValEntry () //----------------------------------------------------------------------------- // Print /** - * \brief canonical Printer + * \brief Prints the 'std::string representable' value of ValEntry + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing */ -void ValEntry::Print(std::ostream & os) +void ValEntry::Print(std::ostream &os, std::string const &) { uint16_t g = GetGroup(); uint16_t e = GetElement(); - std::string vr = GetVR(); + VRKey vr = GetVR(); std::ostringstream s; std::string st; - TSKey v; std::string d2; + os << "V "; DocEntry::Print(os); - if (g == 0xfffe) + if (g == 0xfffe) // delimiters have NO value { // just to avoid identing all the remaining code return; @@ -86,11 +86,11 @@ void ValEntry::Print(std::ostream & os) TS * ts = Global::GetTS(); - v = GetValue(); // not applicable for SQ ... + TSAtr v = GetValue(); // not applicable for SQ ... d2 = Util::CreateCleanString(v); // replace non printable characters by '.' - if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || - //(PrintLevel>=3) || (d2.find("gdcm::NotLoaded.") < d2.length()) ) - (PrintLevel>=3) || (d2.find(GDCM_NOTLOADED) < d2.length()) ) + if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE + || PrintLevel >= 3 + || d2.find(GDCM_NOTLOADED) < d2.length() ) { s << " [" << d2 << "]"; } @@ -104,11 +104,11 @@ void ValEntry::Print(std::ostream & os) if (g == 0x0002) { // Any more to be displayed ? - if ( (e == 0x0010) || (e == 0x0002) ) + if ( e == 0x0010 || e == 0x0002 ) { if ( v.length() != 0 ) // for brain damaged headers { - if ( ! isdigit(v[v.length()-1]) ) + if ( ! isdigit((unsigned char)v[v.length()-1]) ) { v.erase(v.length()-1, 1); } @@ -124,7 +124,7 @@ void ValEntry::Print(std::ostream & os) { if ( v.length() != 0 ) // for brain damaged headers { - if ( ! isdigit(v[v.length()-1]) ) + if ( ! isdigit((unsigned char)v[v.length()-1]) ) { v.erase(v.length()-1, 1); } @@ -136,11 +136,11 @@ void ValEntry::Print(std::ostream & os) { if (g == 0x0004) { - if ( (e == 0x1510) || (e == 0x1512) ) + if ( e == 0x1510 || e == 0x1512 ) { if ( v.length() != 0 ) // for brain damaged headers { - if ( ! isdigit(v[v.length()-1]) ) + if ( ! isdigit((unsigned char)v[v.length()-1]) ) { v.erase(v.length()-1, 1); } @@ -151,7 +151,7 @@ void ValEntry::Print(std::ostream & os) } } //if (e == 0x0000) { // elem 0x0000 --> group length - if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) + if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" ) { if (v == "4294967295") // to avoid troubles in convertion { @@ -159,7 +159,7 @@ void ValEntry::Print(std::ostream & os) } else { - if ( GetLength() !=0 ) + if ( GetLength() != 0 ) { st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME } @@ -173,25 +173,73 @@ void ValEntry::Print(std::ostream & os) os << s.str(); } -/* - * \brief canonical Writer +//----------------------------------------------------------------------------- +// Public + +/** + * \brief Sets the std::string representable' value of a ValEntry + * @param val value to set */ -void ValEntry::Write(std::ofstream* fp, FileType filetype) + +void ValEntry::SetValue(std::string const &val) { - DocEntry::Write(fp, filetype); + // Integers have a special treatement for their length: + int l = val.length(); + if ( l != 0) // To avoid to be cheated by 'zero length' integers + { + const VRKey &vr = GetVR(); + if( vr == "US" || vr == "SS" ) + { + // for multivaluated items + l = (Util::CountSubstring(val, "\\") + 1) * 2; + ContentEntry::SetValue(val); + } + else if( vr == "UL" || vr == "SL" ) + { + // for multivaluated items + l = (Util::CountSubstring(val, "\\") + 1) * 4;; + ContentEntry::SetValue(val); + } + else + { + std::string finalVal = Util::DicomString( val.c_str() ); + gdcmAssertMacro( !(finalVal.size() % 2) ); - //std::cout << "=====================================" << GetVR() << std::endl; - - if ( GetGroup() == 0xfffe ) + l = finalVal.length(); + ContentEntry::SetValue(finalVal); + } + } + else + { + std::string finalVal = Util::DicomString( val.c_str() ); + gdcmAssertMacro( !(finalVal.size() % 2) ); + + l = finalVal.length(); + ContentEntry::SetValue(finalVal); + } + + SetLength(l); +} + +/** + * \brief Writes the std::string representable' value of a ValEntry + * @param fp already open ofstream pointer + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) + */ +void ValEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ + DocEntry::WriteContent(fp, filetype); + + if ( GetGroup() == 0xfffe ) { return; //delimitors have NO value } - - std::string vr = GetVR(); - int lgr = GetReadLength(); + + const VRKey &vr = GetVR(); + unsigned int lgr = GetLength(); if (vr == "US" || vr == "SS") { - // some 'Short integer' fields may be mulivaluated + // some 'Short integer' fields may be multivaluated // each single value is separated from the next one by '\' // we split the string and write each value as a short int std::vector tokens; @@ -200,8 +248,7 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype) for (unsigned int i=0; iwrite ( (char*)ptr,(size_t)2); + binary_write( *fp, val_uint16); } tokens.clear(); return; @@ -209,7 +256,7 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype) if (vr == "UL" || vr == "SL") { // Some 'Integer' fields may be multivaluated (multiple instances - // of integers). But each single integer value is separated from the + // of integer). But each single integer value is separated from the // next one by '\' (backslash character). Hence we split the string // along the '\' and write each value as an int: std::vector tokens; @@ -218,18 +265,15 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype) for (unsigned int i=0; iwrite ( (char*)ptr,(size_t)4 ); + binary_write( *fp, val_uint32); } tokens.clear(); return; } - - fp->write (GetValue().c_str(), (size_t)lgr ); // Elem value -} -//----------------------------------------------------------------------------- -// Public + gdcmAssertMacro( lgr == GetValue().length() ); + binary_write(*fp, GetValue()); +} //----------------------------------------------------------------------------- // Protected