Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/06/22 13:47:33 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2004/07/20 08:29:13 $
+ Version: $Revision: 1.18 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
void gdcmValEntry::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];
TSKey v;
- std::string d2, vr;
+ std::string d2;
- PrintCommonPart(os);
+ gdcmDocEntry::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();
v = GetValue(); // not applicable for SQ ...
s << " [gdcm::too long for print (" << GetLength() << ") ]";
}
- // Display the UID value (instead of displaying only the rough code)
+ // 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 ( (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 ( (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 ( (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 (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 {
}
s << st;
}
-
- s << std::endl;
- os << s.str();
+ os << s.str();
}
-
/*
* \brief canonical Writer
*/
-void gdcmValEntry::Write(FILE *fp, FileType filetype) {
- string vr=GetVR();
- int lgr=GetLength();
- 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<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++) {
- guint16 val_uint16 = atoi(tokens[i].c_str());
- void *ptr = &val_uint16;
- fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
- }
- tokens.clear();
- return;
+void gdcmValEntry::Write(FILE *fp, FileType filetype)
+{
+ gdcmDocEntry::Write(fp, filetype);
+ std::string vr=GetVR();
+ 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<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++) {
+ uint16_t val_uint16 = atoi(tokens[i].c_str());
+ void *ptr = &val_uint16;
+ fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
}
- if (vr == "UL" || vr == "SL") {
- // Some 'Integer' fields may be multivaluated (multiple instances
- // of integers). But each single integer value is separated from the
- // next one by '\' (backslash character). Hence we split the string
- // along the '\' and write each value as an int:
- 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++){
- guint32 val_uint32 = atoi(tokens[i].c_str());
- void *ptr = &val_uint32;
- fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
- }
- tokens.clear();
- return;
- }
- fwrite (GetValue().c_str(),
- (size_t)lgr ,(size_t)1, fp); // Elem value
+ tokens.clear();
+ return;
+ }
+ if (vr == "UL" || vr == "SL")
+ {
+ // Some 'Integer' fields may be multivaluated (multiple instances
+ // of integers). But each single integer value is separated from the
+ // next one by '\' (backslash character). Hence we split the string
+ // along the '\' and write each value as an int:
+ 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++){
+ uint32_t val_uint32 = atoi(tokens[i].c_str());
+ void *ptr = &val_uint32;
+ fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
+ }
+ tokens.clear();
+ return;
+ }
+
+ fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
}
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff