Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/12/07 13:39:33 $
- Version: $Revision: 1.39 $
+ Date: $Date: 2005/01/12 17:10:15 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmTS.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
#include <fstream>
* \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();
+ Copy(e);
+/* Length = e->GetLength();
+ ReadLength = e->GetReadLength();
+ ImplicitVR = e->IsImplicitVR();
+ Offset = e->GetOffset();*/
}
/**
* \brief canonical Printer
*/
-void ValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream &os)
{
uint16_t g = GetGroup();
uint16_t e = GetElement();
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()) )
{
s << " [" << d2 << "]";
//-----------------------------------------------------------------------------
// Public
-void ValEntry::SetValue(std::string const & val)
+void ValEntry::SetValue(std::string const &val)
{
// Integers have a special treatement for their length:
int l = val.length();
{
// 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() );
+ gdcmAssertMacro( !(finalVal.size() % 2) );
+
+ l = finalVal.length();
+ SetValueOnly(finalVal);
}
- SetValueOnly(val);
}
else
{
std::string finalVal = Util::DicomString( val.c_str() );
- assert( !(finalVal.size() % 2) );
+ gdcmAssertMacro( !(finalVal.size() % 2) );
l = finalVal.length();
SetValueOnly(finalVal);
/*
* \brief canonical Writer
*/
-void ValEntry::WriteContent(std::ofstream* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
DocEntry::WriteContent(fp, filetype);
- if ( GetGroup() == 0xfffe )
+ if ( GetGroup() == 0xfffe )
{
return; //delimitors have NO value
}
-
+
std::string vr = GetVR();
- unsigned int lgr = GetReadLength();
+ unsigned int lgr = GetLength();
+ //std::cout<<std::hex<<GetGroup()<<"|"<<GetElement()<<std::dec<<" : "<<GetReadLength()<<" / "<<GetLength()<<"\n";
if (vr == "US" || vr == "SS")
{
// some 'Short integer' fields may be mulivaluated
return;
}
- assert( lgr == GetValue().length() );
+ gdcmAssertMacro( lgr == GetValue().length() );
binary_write(*fp, GetValue());
}