X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=9359185d56d530405ba3954d88893fc2cea0cc8d;hb=44fb45f8dc5333dd9cfce5ecffd048d15efb16ab;hp=40a36a6d7479a6975ab2f7085fffe682cc26f290;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 40a36a6d..9359185d 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.cxx,v $ Language: C++ - Date: $Date: 2005/01/24 16:10:53 $ - Version: $Revision: 1.50 $ + Date: $Date: 2005/06/07 10:07:20 $ + Version: $Revision: 1.61 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,22 +22,23 @@ #include "gdcmGlobal.h" #include "gdcmUtil.h" #include "gdcmDebug.h" +#include "gdcmDocument.h" #include namespace gdcm { - -// CLEAN ME -#define MAX_SIZE_PRINT_ELEMENT_VALUE 128 - +//----------------------------------------------------------------------------- +#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff +uint32_t ValEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE; //----------------------------------------------------------------------------- // Constructor / Destructor /** * \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) { } @@ -46,12 +47,11 @@ ValEntry::ValEntry(DictEntry *e) : DocEntry(e) * @param e Pointer to existing Doc entry */ ValEntry::ValEntry(DocEntry *e) - : DocEntry(e->GetDictEntry()) + : ContentEntry(e->GetDictEntry()) { Copy(e); } - /** * \brief Canonical destructor. */ @@ -59,6 +59,132 @@ ValEntry::~ValEntry () { } +//----------------------------------------------------------------------------- +// Public +/** + * \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 + } + + const VRKey &vr = GetVR(); + unsigned int lgth = GetLength(); + if (vr == "US" || vr == "SS") + { + // 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; + tokens.erase(tokens.begin(),tokens.end()); // clean any previous value + Util::Tokenize (GetValue(), tokens, "\\"); + for (unsigned int i=0; i tokens; + tokens.erase(tokens.begin(),tokens.end()); // clean any previous value + Util::Tokenize (GetValue(), tokens, "\\"); + for (unsigned int i=0; i= (uint32_t)0xffffffff ) + { + ValEntry::MaxSizePrintEntry = 0xffffffff; + return; + } + ValEntry::MaxSizePrintEntry = newSize; +} + + +/** + * \brief Sets the std::string representable' value of a ValEntry + * @param val value to set + */ +void ValEntry::SetValue(std::string const &val) +{ + // 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) ); + + 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); +} + +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + //----------------------------------------------------------------------------- // Print /** @@ -70,7 +196,7 @@ void ValEntry::Print(std::ostream &os, std::string const &) { uint16_t g = GetGroup(); uint16_t e = GetElement(); - VRKey vr = GetVR(); + VRKey vr = GetVR(); std::ostringstream s; std::string st; std::string d2; @@ -84,11 +210,11 @@ void ValEntry::Print(std::ostream &os, std::string const &) return; } - TS * ts = Global::GetTS(); + TS *ts = Global::GetTS(); - TSAtr v = GetValue(); // not applicable for SQ ... + TSAtr v = GetValue(); d2 = Util::CreateCleanString(v); // replace non printable characters by '.' - if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE + if( (long)GetLength() <= ValEntry::GetMaxSizePrintEntry() || PrintLevel >= 3 || d2.find(GDCM_NOTLOADED) < d2.length() ) { @@ -155,7 +281,7 @@ void ValEntry::Print(std::ostream &os, std::string const &) { if (v == "4294967295") // to avoid troubles in convertion { - st = Util::Format(" x(ffffffff)"); + st = "ffffffff"; } else { @@ -165,7 +291,7 @@ void ValEntry::Print(std::ostream &os, std::string const &) } else { - st = Util::Format(" "); + st = " "; } } s << st; @@ -173,114 +299,6 @@ void ValEntry::Print(std::ostream &os, std::string const &) os << s.str(); } -//----------------------------------------------------------------------------- -// Public - -/** - * \brief Sets the std::string representable' value of a ValEntry - * @param val value to set - */ - -void ValEntry::SetValue(std::string const &val) -{ - // 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; - SetValueOnly(val); - } - else if( vr == "UL" || vr == "SL" ) - { - // for multivaluated items - l = (Util::CountSubstring(val, "\\") + 1) * 4;; - SetValueOnly(val); - } - else - { - std::string finalVal = Util::DicomString( val.c_str() ); - gdcmAssertMacro( !(finalVal.size() % 2) ); - - l = finalVal.length(); - SetValueOnly(finalVal); - } - } - else - { - std::string finalVal = Util::DicomString( val.c_str() ); - gdcmAssertMacro( !(finalVal.size() % 2) ); - - l = finalVal.length(); - SetValueOnly(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 - } - - const VRKey &vr = GetVR(); - unsigned int lgr = GetLength(); - if (vr == "US" || vr == "SS") - { - // 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; - tokens.erase(tokens.begin(),tokens.end()); // clean any previous value - Util::Tokenize (GetValue(), tokens, "\\"); - for (unsigned int i=0; i tokens; - tokens.erase(tokens.begin(),tokens.end()); // clean any previous value - Util::Tokenize (GetValue(), tokens, "\\"); - for (unsigned int i=0; i