Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/11/08 15:18:02 $
- Version: $Revision: 1.34 $
+ Date: $Date: 2005/01/06 20:03:28 $
+ Version: $Revision: 1.42 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmValEntry.h"
+#include "gdcmVR.h"
#include "gdcmTS.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
* \brief Constructor from a given DictEntry
* @param e Pointer to existing dictionary entry
*/
-ValEntry::ValEntry(DictEntry* e) : DocEntry(e)
+ValEntry::ValEntry(DictEntry *e) : DocEntry(e)
{
}
* \brief Constructor from a given DocEntry
* @param e Pointer to existing Doc entry
*/
-ValEntry::ValEntry(DocEntry* e)
+ValEntry::ValEntry(DocEntry *e)
: DocEntry(e->GetDictEntry())
{
UsableLength = e->GetLength();
ReadLength = e->GetReadLength();
ImplicitVR = e->IsImplicitVR();
Offset = e->GetOffset();
- PrintLevel = e->GetPrintLevel();
}
/**
* \brief canonical Printer
*/
-void ValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream &os)
{
uint16_t g = GetGroup();
uint16_t e = GetElement();
TSKey v;
std::string d2;
+ os << "V ";
DocEntry::Print(os);
if (g == 0xfffe)
{
if ( v.length() != 0 ) // for brain damaged headers
{
- if ( ! isdigit(v[v.length()-1]) )
+ if ( ! isdigit((unsigned char)v[v.length()-1]) )
{
v.erase(v.length()-1, 1);
}
{
if ( v.length() != 0 ) // for brain damaged headers
{
- if ( ! isdigit(v[v.length()-1]) )
+ if ( ! isdigit((unsigned char)v[v.length()-1]) )
{
v.erase(v.length()-1, 1);
}
{
if ( v.length() != 0 ) // for brain damaged headers
{
- if ( ! isdigit(v[v.length()-1]) )
+ if ( ! isdigit((unsigned char)v[v.length()-1]) )
{
v.erase(v.length()-1, 1);
}
os << s.str();
}
+//-----------------------------------------------------------------------------
+// Public
+void ValEntry::SetValue(std::string const &val)
+{
+ // Integers have a special treatement for their length:
+ int l = val.length();
+ if ( l != 0) // To avoid to be cheated by 'zero length' integers
+ {
+ VRKey vr = GetVR();
+ if( vr == "US" || vr == "SS" )
+ {
+ // for multivaluated items
+ l = (Util::CountSubstring(val, "\\") + 1) * 2;
+ SetValueOnly(val);
+ }
+ else if( vr == "UL" || vr == "SL" )
+ {
+ // for multivaluated items
+ l = (Util::CountSubstring(val, "\\") + 1) * 4;;
+ SetValueOnly(val);
+ }
+ else
+ {
+ std::string finalVal = Util::DicomString( val.c_str() );
+ assert( !(finalVal.size() % 2) );
+
+ l = finalVal.length();
+ SetValueOnly(finalVal);
+ }
+ }
+ else
+ {
+ std::string finalVal = Util::DicomString( val.c_str() );
+ assert( !(finalVal.size() % 2) );
+
+ l = finalVal.length();
+ SetValueOnly(finalVal);
+ }
+
+ SetLength(l);
+}
+
/*
* \brief canonical Writer
*/
-void ValEntry::Write(std::ofstream* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
- DocEntry::Write(fp, filetype);
+ DocEntry::WriteContent(fp, filetype);
- //std::cout << "=====================================" << GetVR() << std::endl;
-
if ( GetGroup() == 0xfffe )
{
return; //delimitors have NO value
}
std::string vr = GetVR();
- int lgr = GetReadLength();
+ unsigned int lgr = GetReadLength();
if (vr == "US" || vr == "SS")
{
// some 'Short integer' fields may be mulivaluated
return;
}
- assert( lgr == GetValue().size() );
+ assert( lgr == GetValue().length() );
binary_write(*fp, GetValue());
}
-//-----------------------------------------------------------------------------
-// Public
-
//-----------------------------------------------------------------------------
// Protected