Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/10/10 00:42:55 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2004/12/07 13:39:33 $
+ Version: $Revision: 1.39 $
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"
+#include <fstream>
+
+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)
{
}
/**
- * \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())
{
UsableLength = e->GetLength();
ReadLength = e->GetReadLength();
/**
* \brief Canonical destructor.
*/
-gdcmValEntry::~gdcmValEntry ()
+ValEntry::~ValEntry ()
{
}
/**
* \brief canonical Printer
*/
-void gdcmValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream & os)
{
uint16_t g = GetGroup();
uint16_t e = GetElement();
TSKey v;
std::string d2;
- gdcmDocEntry::Print(os);
+ os << "V ";
+ DocEntry::Print(os);
if (g == 0xfffe)
{
return;
}
- gdcmTS * ts = gdcmGlobal::GetTS();
+ TS * ts = Global::GetTS();
v = GetValue(); // not applicable for SQ ...
- d2 = gdcmUtil::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()) )
{
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);
}
{
if (v == "4294967295") // to avoid troubles in convertion
{
- st = gdcmUtil::Format(" x(ffffffff)");
+ st = Util::Format(" x(ffffffff)");
}
else
{
if ( GetLength() !=0 )
{
- st = gdcmUtil::Format(" x(%x)", atoi(v.c_str()));//FIXME
+ st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
}
else
{
- st = gdcmUtil::Format(" ");
+ st = Util::Format(" ");
}
}
s << st;
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;
+ }
+ 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);
+ }
+
+ SetLength(l);
+}
+
/*
* \brief canonical Writer
*/
-void gdcmValEntry::Write(FILE* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream* fp, FileType filetype)
{
- gdcmDocEntry::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
// 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
- gdcmUtil::Tokenize (GetValue(), tokens, "\\");
+ Util::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);
+ binary_write( *fp, val_uint16);
}
tokens.clear();
return;
// along the '\' and write each value as an int:
std::vector<std::string> tokens;
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- gdcmUtil::Tokenize (GetValue(), tokens, "\\");
+ Util::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);
+ binary_write( *fp, val_uint32);
}
tokens.clear();
return;
}
-
- fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
-}
-//-----------------------------------------------------------------------------
-// Public
+ assert( lgr == GetValue().length() );
+ binary_write(*fp, GetValue());
+}
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
+} // end namespace gdcm
+
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff