X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=6b81bad9ba9346e0e75a2011fb86dea211c53b93;hb=43f675c5d192ff4b28c42397d36beee5988419de;hp=3dd80953caa06389b42baaa21f9537ab9b645e4a;hpb=ecac4d36edf15736ae8f516ef3f9d8a6396ed54c;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 3dd80953..6b81bad9 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.cxx,v $ Language: C++ - Date: $Date: 2004/08/01 03:20:23 $ - Version: $Revision: 1.20 $ + Date: $Date: 2005/01/06 20:03:28 $ + Version: $Revision: 1.42 $ 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 @@ -17,51 +17,48 @@ =========================================================================*/ #include "gdcmValEntry.h" +#include "gdcmVR.h" #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include + +namespace gdcm +{ + // CLEAN ME #define MAX_SIZE_PRINT_ELEMENT_VALUE 128 //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Constructor from a given gdcmDictEntry + * \brief Constructor from a given DictEntry * @param e Pointer to existing dictionary entry */ -gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e) +ValEntry::ValEntry(DictEntry *e) : DocEntry(e) { - voidArea = NULL; // will be in BinEntry ? } /** - * \brief Constructor from a given gdcmDocEntry + * \brief Constructor from a given DocEntry * @param e Pointer to existing Doc entry */ -gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry()) +ValEntry::ValEntry(DocEntry *e) + : DocEntry(e->GetDictEntry()) { UsableLength = e->GetLength(); ReadLength = e->GetReadLength(); ImplicitVR = e->IsImplicitVR(); Offset = e->GetOffset(); - PrintLevel = e->GetPrintLevel(); - SQDepthLevel = e->GetDepthLevel(); - - voidArea = NULL; // will be in BinEntry ? } /** * \brief Canonical destructor. */ -gdcmValEntry::~gdcmValEntry () +ValEntry::~ValEntry () { - if (!voidArea) // will be in BinEntry - { - free(voidArea); - voidArea = NULL; // let's be carefull ! - } } //----------------------------------------------------------------------------- @@ -69,17 +66,18 @@ gdcmValEntry::~gdcmValEntry () /** * \brief canonical Printer */ -void gdcmValEntry::Print(std::ostream & os) +void ValEntry::Print(std::ostream &os) { uint16_t g = GetGroup(); uint16_t e = GetElement(); std::string vr = GetVR(); std::ostringstream s; - char st[20]; + std::string st; TSKey v; std::string d2; - gdcmDocEntry::Print(os); + os << "V "; + DocEntry::Print(os); if (g == 0xfffe) { @@ -87,12 +85,13 @@ void gdcmValEntry::Print(std::ostream & os) return; } - gdcmTS * ts = gdcmGlobal::GetTS(); + TS * ts = Global::GetTS(); v = GetValue(); // not applicable for SQ ... - d2 = CreateCleanString(v); // replace non printable characters by '.' + 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()) ) + (PrintLevel>=3) || (d2.find(GDCM_NOTLOADED) < d2.length()) ) { s << " [" << d2 << "]"; } @@ -110,7 +109,7 @@ void gdcmValEntry::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); } @@ -126,7 +125,7 @@ void gdcmValEntry::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); } @@ -142,7 +141,7 @@ void gdcmValEntry::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); } @@ -157,17 +156,17 @@ void gdcmValEntry::Print(std::ostream & os) { if (v == "4294967295") // to avoid troubles in convertion { - sprintf (st," x(ffffffff)"); + st = Util::Format(" x(ffffffff)"); } else { if ( GetLength() !=0 ) { - sprintf(st," x(%x)", atoi(v.c_str()));//FIXME + st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME } else { - sprintf(st," "); + st = Util::Format(" "); } } s << st; @@ -175,14 +174,62 @@ void gdcmValEntry::Print(std::ostream & os) os << s.str(); } +//----------------------------------------------------------------------------- +// Public +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 + { + 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() ); + assert( !(finalVal.size() % 2) ); + + l = finalVal.length(); + SetValueOnly(finalVal); + } + } + else + { + std::string finalVal = Util::DicomString( val.c_str() ); + assert( !(finalVal.size() % 2) ); + + l = finalVal.length(); + SetValueOnly(finalVal); + } + + SetLength(l); +} + /* * \brief canonical Writer */ -void gdcmValEntry::Write(FILE *fp, FileType filetype) +void ValEntry::WriteContent(std::ofstream *fp, FileType filetype) { - gdcmDocEntry::Write(fp, filetype); + DocEntry::WriteContent(fp, filetype); + + if ( GetGroup() == 0xfffe ) + { + return; //delimitors have NO value + } + std::string vr = GetVR(); - int lgr = GetReadLength(); + unsigned int lgr = GetReadLength(); if (vr == "US" || vr == "SS") { // some 'Short integer' fields may be mulivaluated @@ -190,12 +237,11 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype) // 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 - Tokenize (GetValue(), tokens, "\\"); + Util::Tokenize (GetValue(), tokens, "\\"); for (unsigned int i=0; i tokens; tokens.erase(tokens.begin(),tokens.end()); // clean any previous value - Tokenize (GetValue(), tokens, "\\"); + Util::Tokenize (GetValue(), tokens, "\\"); for (unsigned int i=0; i