Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/08/16 16:30:32 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2004/09/27 08:39:08 $
+ Version: $Revision: 1.27 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
*/
gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
{
- VoidArea = NULL; // will be in BinEntry ?
}
/**
* \brief Constructor from a given gdcmDocEntry
* @param e Pointer to existing Doc entry
*/
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+gdcmValEntry::gdcmValEntry(gdcmDocEntry* e)
+ : gdcmDocEntry(e->GetDictEntry())
{
UsableLength = e->GetLength();
ReadLength = e->GetReadLength();
ImplicitVR = e->IsImplicitVR();
Offset = e->GetOffset();
PrintLevel = e->GetPrintLevel();
- SQDepthLevel = e->GetDepthLevel();
-
- VoidArea = NULL; // will be in BinEntry ?
}
*/
gdcmValEntry::~gdcmValEntry ()
{
- if (!VoidArea) // will be in BinEntry
- {
- free(VoidArea);
- VoidArea = NULL; // let's be carefull !
- }
}
//-----------------------------------------------------------------------------
v = GetValue(); // not applicable for SQ ...
d2 = 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()) )
+ (PrintLevel>=3) || (d2.find(GDCM_NOTLOADED) < d2.length()) )
{
s << " [" << d2 << "]";
}
/*
* \brief canonical Writer
*/
-void gdcmValEntry::Write(FILE *fp, FileType filetype)
+void gdcmValEntry::Write(FILE* fp, FileType filetype)
{
gdcmDocEntry::Write(fp, filetype);
+
+ //std::cout << "=====================================" << GetVR() << std::endl;
+
+ if ( GetGroup() == 0xfffe )
+ {
+ return; //delimitors have NO value
+ }
+
std::string vr = GetVR();
int lgr = GetReadLength();
if (vr == "US" || vr == "SS")
for (unsigned int i=0; i<tokens.size();i++)
{
uint16_t val_uint16 = atoi(tokens[i].c_str());
- void *ptr = &val_uint16;
+ void* ptr = &val_uint16;
fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
}
tokens.clear();
for (unsigned int i=0; i<tokens.size();i++)
{
uint32_t val_uint32 = atoi(tokens[i].c_str());
- void *ptr = &val_uint32;
+ void* ptr = &val_uint32;
fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
}
tokens.clear();