Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/07/19 15:16:19 $
- Version: $Revision: 1.17 $
+ Date: $Date: 2004/09/13 12:10:53 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
{
- voidArea = NULL; // will be in BinEntry ?
}
/**
* \brief Constructor from a given gdcmDocEntry
* @param e Pointer to existing Doc entry
*/
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+gdcmValEntry::gdcmValEntry(gdcmDocEntry* e)
+ : gdcmDocEntry(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)
+gdcmValEntry::~gdcmValEntry ()
{
- if (!voidArea) // will be in BinEntry
- free(voidArea);
}
-
//-----------------------------------------------------------------------------
// Print
/**
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()) )
+ //(PrintLevel>=3) || (d2.find("gdcm::NotLoaded.") < d2.length()) )
+ (PrintLevel>=3) || (d2.find(GDCM_NOTLOADED) < d2.length()) )
{
s << " [" << d2 << "]";
}
// 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 ( ! 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) ) {
+ 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 )
+ {
+ 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) ) {
- 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(v[v.length()-1]) )
+ {
+ v.erase(v.length()-1, 1);
+ }
+ }
s << " ==>\t[" << ts->GetValue(v) << "]";
}
}
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 )
+ }
+ else
+ {
+ if ( GetLength() !=0 )
+ {
sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
- else
- sprintf(st," ");
+ }
+ else
+ {
+ sprintf(st," ");
+ }
}
s << st;
}
void gdcmValEntry::Write(FILE *fp, FileType filetype)
{
gdcmDocEntry::Write(fp, filetype);
- std::string vr=GetVR();
- int lgr=GetReadLength();
+
+ //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
std::vector<std::string> tokens;
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
Tokenize (GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++) {
+ for (unsigned int i=0; i<tokens.size();i++)
+ {
uint16_t val_uint16 = atoi(tokens[i].c_str());
void *ptr = &val_uint16;
fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
std::vector<std::string> tokens;
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
Tokenize (GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++){
+ for (unsigned int i=0; i<tokens.size();i++)
+ {
uint32_t val_uint32 = atoi(tokens[i].c_str());
void *ptr = &val_uint32;
fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);