Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2005/01/23 10:12:34 $
- Version: $Revision: 1.49 $
+ Date: $Date: 2005/01/25 16:32:45 $
+ Version: $Revision: 1.52 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \brief Constructor from a given DictEntry
* @param e Pointer to existing dictionary entry
*/
-ValEntry::ValEntry(DictEntry *e) : DocEntry(e)
+ValEntry::ValEntry(DictEntry *e) : ContentEntry(e)
{
}
* @param e Pointer to existing Doc entry
*/
ValEntry::ValEntry(DocEntry *e)
- : DocEntry(e->GetDictEntry())
+ : ContentEntry(e->GetDictEntry())
{
Copy(e);
}
os << "V ";
DocEntry::Print(os);
- if (g == 0xfffe)
+ if (g == 0xfffe) // delimiters have NO value
{
// just to avoid identing all the remaining code
return;
{
// for multivaluated items
l = (Util::CountSubstring(val, "\\") + 1) * 2;
- SetValueOnly(val);
+ ContentEntry::SetValue(val);
}
else if( vr == "UL" || vr == "SL" )
{
// for multivaluated items
l = (Util::CountSubstring(val, "\\") + 1) * 4;;
- SetValueOnly(val);
+ ContentEntry::SetValue(val);
}
else
{
gdcmAssertMacro( !(finalVal.size() % 2) );
l = finalVal.length();
- SetValueOnly(finalVal);
+ ContentEntry::SetValue(finalVal);
}
}
else
gdcmAssertMacro( !(finalVal.size() % 2) );
l = finalVal.length();
- SetValueOnly(finalVal);
+ ContentEntry::SetValue(finalVal);
}
SetLength(l);
/**
* \brief Writes the std::string representable' value of a ValEntry
* @param fp already open ofstream pointer
- * @param filetype type of the file to be written
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
const VRKey &vr = GetVR();
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
+ // some 'Short integer' fields may be multivaluated
// 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;
if (vr == "UL" || vr == "SL")
{
// Some 'Integer' fields may be multivaluated (multiple instances
- // of integers). But each single integer value is separated from the
+ // of integer). 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;