Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2005/01/07 22:19:48 $
- Version: $Revision: 1.44 $
+ Date: $Date: 2005/01/17 01:14:33 $
+ Version: $Revision: 1.47 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief canonical Printer
*/
-void ValEntry::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;
std::string st;
- TSKey v;
std::string d2;
os << "V ";
TS * ts = Global::GetTS();
- v = GetValue(); // not applicable for SQ ...
+ 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()) )
- (PrintLevel>=3) || (d2.find(GDCM_NOTLOADED) < d2.length()) )
+ if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE
+ || PrintLevel >= 3
+ || d2.find(GDCM_NOTLOADED) < d2.length() )
{
s << " [" << d2 << "]";
}
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 (g == 0x0004)
{
- if ( (e == 0x1510) || (e == 0x1512) )
+ if ( e == 0x1510 || e == 0x1512 )
{
if ( v.length() != 0 ) // for brain damaged headers
{
}
}
//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
{
}
else
{
- if ( GetLength() !=0 )
+ if ( GetLength() != 0 )
{
st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
}
int l = val.length();
if ( l != 0) // To avoid to be cheated by 'zero length' integers
{
- VRKey vr = GetVR();
+ const VRKey &vr = GetVR();
if( vr == "US" || vr == "SS" )
{
// for multivaluated items
return; //delimitors have NO value
}
- std::string vr = GetVR();
+ const VRKey &vr = GetVR();
unsigned int lgr = GetLength();
//std::cout<<std::hex<<GetGroup()<<"|"<<GetElement()<<std::dec<<" : "<<GetReadLength()<<" / "<<GetLength()<<"\n";
if (vr == "US" || vr == "SS")