X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=22029469235ee51bf004e43e92d8b82c50e742d6;hb=033352f8a0d333fc12b7fa625d1819a574f4ddef;hp=36bdca4f6fa6926b9acd2a6a57bb2d6442c50ee9;hpb=b2b47f58ff222d08d65d4338855b48719e5277b3;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 36bdca4f..22029469 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/07/20 08:29:13 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/01/19 15:58:01 $ + Version: $Revision: 1.48 $ 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,9 +17,16 @@ =========================================================================*/ #include "gdcmValEntry.h" +#include "gdcmVR.h" #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" + +#include + +namespace gdcm +{ // CLEAN ME #define MAX_SIZE_PRINT_ELEMENT_VALUE 128 @@ -27,57 +34,47 @@ //----------------------------------------------------------------------------- // 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()) { - this->UsableLength = e->GetLength(); - this->ReadLength = e->GetReadLength(); - this->ImplicitVR = e->IsImplicitVR(); - this->Offset = e->GetOffset(); - this->printLevel = e->GetPrintLevel(); - this->SQDepthLevel = e->GetDepthLevel(); - - this->voidArea = NULL; // will be in BinEntry ? + Copy(e); } /** * \brief Canonical destructor. */ -gdcmValEntry::~gdcmValEntry (void) +ValEntry::~ValEntry () { - if (!voidArea) // will be in BinEntry - free(voidArea); } - //----------------------------------------------------------------------------- // Print /** * \brief canonical Printer */ -void gdcmValEntry::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; - char st[20]; - TSKey v; + std::string st; std::string d2; - gdcmDocEntry::Print(os); + os << "V "; + DocEntry::Print(os); if (g == 0xfffe) { @@ -85,12 +82,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 '.' - if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || - (printLevel>=3) || (d2.find("gdcm::NotLoaded.") < d2.length()) ) + 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() ) { s << " [" << d2 << "]"; } @@ -101,56 +99,135 @@ void gdcmValEntry::Print(std::ostream & os) // Display the UID value (instead of displaying only the rough code) // First 'clean' trailing character (space or zero) - if (g == 0x0002) { // Any more to be displayed ? - if ( (e == 0x0010) || (e == 0x0002) ) { + if (g == 0x0002) + { + // Any more to be displayed ? + 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); + } + } s << " ==>\t[" << ts->GetValue(v) << "]"; } - } else { - if (g == 0x0008) { - if ( (e == 0x0016) || (e == 0x1150) ) { + } + else + { + if (g == 0x0008) + { + if ( e == 0x0016 || e == 0x1150 ) + { 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); + } + } s << " ==>\t[" << ts->GetValue(v) << "]"; } - } else { - if (g == 0x0004) { - if ( (e == 0x1510) || (e == 0x1512) ) { - if ( v.length() != 0 ) // for brain damaged headers - if ( ! isdigit(v[v.length()-1]) ) - v.erase(v.length()-1, 1); + } + else + { + if (g == 0x0004) + { + if ( e == 0x1510 || e == 0x1512 ) + { + if ( v.length() != 0 ) // for brain damaged headers + { + if ( ! isdigit((unsigned char)v[v.length()-1]) ) + { + v.erase(v.length()-1, 1); + } + } s << " ==>\t[" << ts->GetValue(v) << "]"; } } } } //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 - sprintf (st," x(ffffffff)"); - else { - if ( GetLength() !=0 ) - sprintf(st," x(%x)", atoi(v.c_str()));//FIXME - else - sprintf(st," "); + { + st = Util::Format(" x(ffffffff)"); + } + else + { + if ( GetLength() != 0 ) + { + st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME + } + else + { + st = Util::Format(" "); + } } s << st; } 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 + { + 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 canonical Writer */ -void gdcmValEntry::Write(FILE *fp, FileType filetype) +void ValEntry::WriteContent(std::ofstream *fp, FileType filetype) { - gdcmDocEntry::Write(fp, filetype); - std::string vr=GetVR(); - int lgr=GetReadLength(); + DocEntry::WriteContent(fp, filetype); + + if ( GetGroup() == 0xfffe ) + { + return; //delimitors have NO value + } + + const VRKey &vr = GetVR(); + unsigned int lgr = GetLength(); + //std::cout< tokens; tokens.erase(tokens.begin(),tokens.end()); // clean any previous value - Tokenize (GetValue(), tokens, "\\"); - for (unsigned int i=0; i tokens; tokens.erase(tokens.begin(),tokens.end()); // clean any previous value - Tokenize (GetValue(), tokens, "\\"); - for (unsigned int i=0; i