Program: gdcm
Module: $RCSfile: gdcmValEntry.cxx,v $
Language: C++
- Date: $Date: 2004/06/23 13:02:36 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2004/11/03 20:52:13 $
+ Version: $Revision: 1.32 $
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
#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)
{
- voidArea = NULL; // will be in BinEntry ?
}
/**
- * \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())
{
- this->UsableLength = e->GetLength();
- this->ReadLength = e->GetReadLength();
- this->ImplicitVR = e->IsImplicitVR();
- this->Offset = e->GetOffset();
- this->printLevel = e->GetPrintLevel();
- this->SQDepthLevel = e->GetDepthLevel();
-
- this->voidArea = NULL; // will be in BinEntry ?
+ UsableLength = e->GetLength();
+ ReadLength = e->GetReadLength();
+ ImplicitVR = e->IsImplicitVR();
+ Offset = e->GetOffset();
+ PrintLevel = e->GetPrintLevel();
}
/**
* \brief Canonical destructor.
*/
-gdcmValEntry::~gdcmValEntry (void)
+ValEntry::~ValEntry ()
{
- if (!voidArea) // will be in BinEntry
- free(voidArea);
}
-
//-----------------------------------------------------------------------------
// Print
/**
* \brief canonical Printer
*/
-void gdcmValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream & os)
{
- guint16 g = GetGroup();
- guint16 e = GetElement();
+ uint16_t g = GetGroup();
+ uint16_t e = GetElement();
std::string vr = GetVR();
std::ostringstream s;
- char st[20];
+ std::string st;
TSKey v;
std::string d2;
- gdcmDocEntry::Print(os);
+ DocEntry::Print(os);
if (g == 0xfffe)
{
return;
}
- gdcmTS * ts = gdcmGlobal::GetTS();
+ TS * ts = Global::GetTS();
v = GetValue(); // not applicable for SQ ...
- d2 = 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()) )
+ (PrintLevel>=3) || (d2.find(GDCM_NOTLOADED) < d2.length()) )
{
s << " [" << d2 << "]";
}
s << " [gdcm::too long for print (" << GetLength() << ") ]";
}
- // Display the UID value (instead of displaying only the rough code)
- if (g == 0x0002) { // Any more to be displayed ?
+ // Display the UID value (instead of displaying only the rough code)
+ // First 'clean' trailing character (space or zero)
+ if (g == 0x0002)
+ {
+ // Any more to be displayed ?
if ( (e == 0x0010) || (e == 0x0002) )
+ {
+ if ( v.length() != 0 ) // for brain damaged headers
+ {
+ if ( ! isdigit(v[v.length()-1]) )
+ {
+ v.erase(v.length()-1, 1);
+ }
+ }
s << " ==>\t[" << ts->GetValue(v) << "]";
- } else {
- if (g == 0x0008) {
- if ( (e == 0x0016) || (e == 0x1150) )
+ }
+ }
+ else
+ {
+ if (g == 0x0008)
+ {
+ if ( e == 0x0016 || e == 0x1150 )
+ {
+ if ( v.length() != 0 ) // for brain damaged headers
+ {
+ if ( ! isdigit(v[v.length()-1]) )
+ {
+ v.erase(v.length()-1, 1);
+ }
+ }
s << " ==>\t[" << ts->GetValue(v) << "]";
- } else {
- if (g == 0x0004) {
- if ( (e == 0x1510) || (e == 0x1512) )
+ }
+ }
+ else
+ {
+ if (g == 0x0004)
+ {
+ if ( (e == 0x1510) || (e == 0x1512) )
+ {
+ if ( v.length() != 0 ) // for brain damaged headers
+ {
+ if ( ! isdigit(v[v.length()-1]) )
+ {
+ v.erase(v.length()-1, 1);
+ }
+ }
s << " ==>\t[" << ts->GetValue(v) << "]";
+ }
}
}
}
if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") )
{
if (v == "4294967295") // to avoid troubles in convertion
- sprintf (st," x(ffffffff)");
- else {
- if ( GetLength() !=0 )
- sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
- else
- sprintf(st," ");
+ {
+ st = Util::Format(" x(ffffffff)");
+ }
+ else
+ {
+ if ( GetLength() !=0 )
+ {
+ st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
+ }
+ else
+ {
+ st = Util::Format(" ");
+ }
}
s << st;
}
/*
* \brief canonical Writer
*/
-void gdcmValEntry::Write(FILE *fp, FileType filetype)
+void ValEntry::Write(std::ofstream* fp, FileType filetype)
{
- gdcmDocEntry::Write(fp, filetype);
- std::string vr=GetVR();
- int lgr=GetLength();
+ DocEntry::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")
{
// 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
- Tokenize (GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++) {
- guint16 val_uint16 = atoi(tokens[i].c_str());
- void *ptr = &val_uint16;
- fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
+ Util::Tokenize (GetValue(), tokens, "\\");
+ for (unsigned int i=0; i<tokens.size();i++)
+ {
+ uint16_t val_uint16 = atoi(tokens[i].c_str());
+ 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
- Tokenize (GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++){
- guint32 val_uint32 = atoi(tokens[i].c_str());
- void *ptr = &val_uint32;
- fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
+ Util::Tokenize (GetValue(), tokens, "\\");
+ for (unsigned int i=0; i<tokens.size();i++)
+ {
+ uint32_t val_uint32 = atoi(tokens[i].c_str());
+ binary_write( *fp, val_uint32);
}
tokens.clear();
return;
- }
- fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
+ }
+
+ fp->write (GetValue().c_str(), (size_t)lgr ); // Elem value
+// assert( lgr == GetValue().size() ); // FIXME ?????
+// dbg.Assert(2, lgr == strlen(GetValue().c_str()), "Should be equal" );
}
//-----------------------------------------------------------------------------
// Private
//-----------------------------------------------------------------------------
+} // end namespace gdcm
+
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff