Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2004/08/31 14:24:47 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2004/10/12 04:35:45 $
+ 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
#include "gdcmUtil.h"
#include <iomanip> // for std::ios::left, ...
+namespace gdcm
+{
// CLEAN ME
#define MAX_SIZE_PRINT_ELEMENT_VALUE 64
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup gdcmDocEntry
- * \brief Constructor from a given gdcmDictEntry
+ * \ingroup DocEntry
+ * \brief Constructor from a given DictEntry
* @param in Pointer to existing dictionary entry
*/
-gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in)
+DocEntry::DocEntry(DictEntry* in)
{
ImplicitVR = false;
- DictEntry = in;
+ DicomDict = in;
+ SetKey( in->GetKey( ) );
+ Offset = 0 ; // To avoid further missprinting
}
//-----------------------------------------------------------------------------
// Print
/**
- * \ingroup gdcmDocEntry
- * \brief Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry
+ * \ingroup DocEntry
+ * \brief Prints the common part of ValEntry, BinEntry, SeqEntry
* @param os ostream we want to print in
*/
-void gdcmDocEntry::Print(std::ostream & os)
+void DocEntry::Print(std::ostream& os)
{
PrintLevel = 2; // FIXME
size_t o;
unsigned short int g, e;
- char st[20];
+ std::string st;
TSKey v;
std::string d2, vr;
std::ostringstream s;
uint32_t lgth;
- char greltag[10]; //group element tag
g = GetGroup();
e = GetElement();
o = GetOffset();
vr = GetVR();
- sprintf(greltag,"%04x|%04x ",g,e);
- s << greltag ;
-
+
+ s << DictEntry::TranslateToKey(GetGroup(),GetElement());
+
if (PrintLevel >= 2)
{
- s << "lg : ";
+ s << " lg : ";
lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
if (lgth == 0xffffffff)
{
- sprintf(st,"x(ffff)"); // I said : "x(ffff)" !
+ st = Util::Format("x(ffff)"); // I said : "x(ffff)" !
s.setf(std::ios::left);
- s << std::setw(10-strlen(st)) << " ";
+ s << std::setw(10-st.size()) << " ";
s << st << " ";
s.setf(std::ios::left);
- s << std::setw(8) << "-1";
+ s << std::setw(8) << "-1";
}
else
{
- sprintf(st,"x(%x)",lgth);
+ st = Util::Format("x(%x)",lgth);
s.setf(std::ios::left);
- s << std::setw(10-strlen(st)) << " ";
+ s << std::setw(10-st.size()) << " ";
s << st << " ";
s.setf(std::ios::left);
s << std::setw(8) << lgth;
}
s << " Off.: ";
- sprintf(st,"x(%x)",o);
- s << std::setw(10-strlen(st)) << " ";
+ st = Util::Format("x(%x)",o);
+ s << std::setw(10-st.size()) << " ";
s << st << " ";
s << std::setw(8) << o;
}
}
/**
- * \ingroup gdcmDocEntry
- * \brief Writes the common part of any gdcmValEntry, gdcmBinEntry, gdcmSeqEntry
+ * \ingroup DocEntry
+ * \brief Writes the common part of any ValEntry, BinEntry, SeqEntry
* @param fp already open file pointer
* @param filetype type of the file to be written
*/
-void gdcmDocEntry::Write(FILE *fp, FileType filetype)
+void DocEntry::Write(FILE* fp, FileType filetype)
{
- uint32_t FFFF = 0xffffffff;
+ uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
- gdcmVRKey vr = GetVR();
+ VRKey vr = GetVR();
uint16_t el = GetElement();
uint32_t lgr = GetReadLength();
return;
}
-//
-// ----------- Writes the common part
-//
+ //
+ // ----------- Writes the common part
+ //
fwrite ( &group,(size_t)2 ,(size_t)1 ,fp); //group
fwrite ( &el, (size_t)2 ,(size_t)1 ,fp); //element
- if ( filetype == gdcmExplicitVR )
+ if ( filetype == ExplicitVR )
{
// Special case of delimiters:
if (group == 0xfffe)
// - a new Item Delimitor Item is encountered (the Seq goes on)
// - a Sequence Delimitor Item is encountered (the Seq just ended)
- // TODO : verify if the Sequence Delimitor Item was forced during Parsing
+ // TODO : verify if the Sequence Delimitor Item was forced during Parsing
int ff = 0xffffffff;
fwrite (&ff,(size_t)4 ,(size_t)1 ,fp);
// Unknown was 'written'
// deal with Little Endian
fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,fp);
- fwrite ( &z, (size_t)2 ,(size_t)1 ,fp);
+ fwrite ( &z, (size_t)2 ,(size_t)1 ,fp);
}
else
{
// we set SQ length to ffffffff
// and we shall write a Sequence Delimitor Item
// at the end of the Sequence!
- fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp);
+ fwrite ( &ffff,(size_t)4 ,(size_t)1 ,fp);
}
else
{
{
if (vr == "SQ")
{
- fwrite ( &FFFF,(size_t)4 ,(size_t)1 ,fp);
+ fwrite ( &ffff,(size_t)4 ,(size_t)1 ,fp);
}
else
{
// Public
/**
- * \ingroup gdcmDocEntry
- * \brief Gets the full length of the elementary DocEntry (not only value length)
+ * \ingroup DocEntry
+ * \brief Gets the full length of the elementary DocEntry (not only value
+ * length) depending on the VR.
*/
-uint32_t gdcmDocEntry::GetFullLength()
+uint32_t DocEntry::GetFullLength()
{
uint32_t l = GetReadLength();
if ( IsImplicitVR() )
}
/**
- * \ingroup gdcmDocEntry
+ * \ingroup DocEntry
* \brief Copies all the attributes from an other DocEntry
*/
-void gdcmDocEntry::Copy (gdcmDocEntry* e)
+void DocEntry::Copy (DocEntry* e)
{
- DictEntry = e->DictEntry;
+ DicomDict = e->DicomDict;
UsableLength = e->UsableLength;
ReadLength = e->ReadLength;
ImplicitVR = e->ImplicitVR;
Offset = e->Offset;
PrintLevel = e->PrintLevel;
- // TODO : remove gdcmDocEntry SQDepth
+ // TODO : remove DocEntry SQDepth
}
/**
- * \ingroup gdcmDocEntry
+ * \ingroup DocEntry
* \brief tells us if entry is the last one of a 'no length' SequenceItem
* (fffe,e00d)
*/
-bool gdcmDocEntry::IsItemDelimitor()
+bool DocEntry::IsItemDelimitor()
{
return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
}
/**
- * \ingroup gdcmDocEntry
+ * \ingroup DocEntry
* \brief tells us if entry is the last one of a 'no length' Sequence
* (fffe,e0dd)
*/
-bool gdcmDocEntry::IsSequenceDelimitor()
+bool DocEntry::IsSequenceDelimitor()
{
return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
}
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff