X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=d6d7b89dfa23f7a20debac870ddd46f93eecc639;hb=8d10ccb6794a0f22234983990e2181a24625fbd8;hp=194bd88d1921c6e71cfff590706e7ca761bd9a61;hpb=57e3ee08a94dc1cd122a0b9c01f091e1b6913152;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 194bd88d..d6d7b89d 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/06/21 12:38:29 $ - Version: $Revision: 1.9 $ + Date: $Date: 2004/11/25 15:46:12 $ + Version: $Revision: 1.38 $ 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,78 +21,77 @@ #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()) { - 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; - unsigned short int g, e; - char st[20]; + std::string st; TSKey v; - std::string d2, vr; + std::string d2; - PrintCommonPart(os); + os << "V "; + DocEntry::Print(os); - g = GetGroup(); - - if (g == 0xfffe) { - s << std::endl; - os << s.str(); - return; // just to avoid identing all the remaining code + if (g == 0xfffe) + { + // just to avoid identing all the remaining code + return; } - e = GetElement(); - vr = GetVR(); - 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 << "]"; } @@ -101,38 +100,133 @@ 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((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((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) ) - s << " ==>\t[" << ts->GetValue(v) << "]"; - } + } + } + 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; } - - s << std::endl; - os << s.str(); + os << s.str(); } - + +/* + * \brief canonical Writer + */ +void ValEntry::WriteContent(std::ofstream* fp, FileType filetype) +{ + DocEntry::WriteContent(fp, filetype); + + //std::cout << "=====================================" << GetVR() << std::endl; + + if ( GetGroup() == 0xfffe ) + { + return; //delimitors have NO value + } + + std::string vr = GetVR(); + unsigned int lgr = GetReadLength(); + if (vr == "US" || vr == "SS") + { + // some 'Short integer' fields may be mulivaluated + // 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