X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=aaf16de4d076b6fd718fe6352df86048d173a7f6;hb=e28b183ba68aa3cc84a44a779a31f9d906a1ad2f;hp=d10cacae8823af65fa20e75d8c294877b9a07e61;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index d10cacae..aaf16de4 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/02 13:55:28 $ - Version: $Revision: 1.16 $ + Date: $Date: 2004/10/12 04:35:48 $ + Version: $Revision: 1.30 $ 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 @@ -21,63 +21,60 @@ #include "gdcmGlobal.h" #include "gdcmUtil.h" +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()) { - 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 ? + UsableLength = e->GetLength(); + ReadLength = e->GetReadLength(); + ImplicitVR = e->IsImplicitVR(); + Offset = e->GetOffset(); + PrintLevel = e->GetPrintLevel(); } /** * \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) { 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); + 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 '.' + 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 << "]"; } @@ -99,18 +97,54 @@ void gdcmValEntry::Print(std::ostream & os) s << " [gdcm::too long for print (" << GetLength() << ") ]"; } - // Display the UID value (instead of displaying only the rough code) - if (g == 0x0002) { // Any more to be displayed ? + // 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 ( v.length() != 0 ) // for brain damaged headers + { + if ( ! isdigit(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]) ) + { + v.erase(v.length()-1, 1); + } + } s << " ==>\t[" << ts->GetValue(v) << "]"; - } else { - if (g == 0x0004) { - if ( (e == 0x1510) || (e == 0x1512) ) + } + } + 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); + } + } s << " ==>\t[" << ts->GetValue(v) << "]"; + } } } } @@ -118,12 +152,19 @@ void gdcmValEntry::Print(std::ostream & os) 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; } @@ -133,11 +174,19 @@ void gdcmValEntry::Print(std::ostream & os) /* * \brief canonical Writer */ -void gdcmValEntry::Write(FILE *fp, FileType filetype) +void ValEntry::Write(FILE* fp, FileType filetype) { - gdcmDocEntry::Write(fp, filetype); - std::string vr=GetVR(); - int lgr=GetReadLength(); + DocEntry::Write(fp, filetype); + + //std::cout << "=====================================" << GetVR() << std::endl; + + if ( GetGroup() == 0xfffe ) + { + return; //delimitors have NO value + } + + std::string vr = GetVR(); + int lgr = GetReadLength(); if (vr == "US" || vr == "SS") { // some 'Short integer' fields may be mulivaluated @@ -145,10 +194,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, "\\"); - 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