Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2004/11/09 22:15:36 $
- Version: $Revision: 1.30 $
+ Date: $Date: 2005/02/02 10:02:17 $
+ Version: $Revision: 1.51 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDocEntry.h"
#include "gdcmTS.h"
+#include "gdcmVR.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
#include <iomanip> // for std::ios::left, ...
#include <fstream>
namespace gdcm
{
-
-// CLEAN ME
+//-----------------------------------------------------------------------------
#define MAX_SIZE_PRINT_ELEMENT_VALUE 64
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup DocEntry
* \brief Constructor from a given DictEntry
* @param in Pointer to existing dictionary entry
*/
-DocEntry::DocEntry(DictEntry* in)
+DocEntry::DocEntry(DictEntry *in)
{
ImplicitVR = false;
DicomDict = in;
SetKey( in->GetKey( ) );
Offset = 0 ; // To avoid further missprinting
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \ingroup DocEntry
- * \brief Prints the common part of ValEntry, BinEntry, SeqEntry
- * @param os ostream we want to print in
- */
-void DocEntry::Print(std::ostream& os)
-{
- PrintLevel = 2; // FIXME
-
- size_t o;
- std::string st;
- TSKey v;
- std::string d2, vr;
- std::ostringstream s;
- uint32_t lgth;
-
- o = GetOffset();
- vr = GetVR();
-
- s << DictEntry::TranslateToKey(GetGroup(),GetElement());
-
- if (PrintLevel >= 2)
- {
- s << " lg : ";
- lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
- if (lgth == 0xffffffff)
- {
- st = Util::Format("x(ffff)"); // I said : "x(ffff)" !
- s.setf(std::ios::left);
- s << std::setw(10-st.size()) << " ";
- s << st << " ";
- s.setf(std::ios::left);
- s << std::setw(8) << "-1";
- }
- else
- {
- st = Util::Format("x(%x)",lgth);
- s.setf(std::ios::left);
- s << std::setw(10-st.size()) << " ";
- s << st << " ";
- s.setf(std::ios::left);
- s << std::setw(8) << lgth;
- }
- s << " Off.: ";
- st = Util::Format("x(%x)",o);
- s << std::setw(10-st.size()) << " ";
- s << st << " ";
- s << std::setw(8) << o;
- }
-
- s << "[" << vr << "] ";
- if (PrintLevel >= 1)
- {
- s.setf(std::ios::left);
- s << std::setw(66-GetName().length()) << " ";
- }
-
- s << "[" << GetName()<< "]";
- os << s.str();
+ // init some variables
+ ReadLength = 0;
+ Length = 0;
}
+//-----------------------------------------------------------------------------
+// Public
/**
- * \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
+ * @param fp already open ofstream pointer
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
-void DocEntry::Write(std::ofstream* fp, FileType filetype)
+void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
- VRKey vr = GetVR();
+ VRKey vr = GetVR();
uint16_t el = GetElement();
- uint32_t lgr = GetReadLength();
+ uint32_t lgr = GetLength();
if ( group == 0xfffe && el == 0x0000 )
{
// we just *always* ignore spurious fffe|0000 tag !
return;
}
-
//
// ----------- Writes the common part
//
- binary_write( *fp, group); //group
- binary_write( *fp, el); //element
+ binary_write( *fp, group); //group number
+ binary_write( *fp, el); //element number
if ( filetype == ExplicitVR )
{
// Hence we skip writing the VR.
// In order to avoid further troubles, we choose to write them
// as 'no-length' Item Delimitors (we pad by writing 0xffffffff)
- // The end of a given Item will be found when :
- // - 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
+ // We shall force the end of a given Item by writting
+ // a Item Delimitation Item (fffe, e00d)
uint32_t ff = 0xffffffff;
binary_write(*fp, ff);
uint16_t z = 0;
uint16_t shortLgr = lgr;
- if (vr == "unkn")
+ if (vr == GDCM_UNKNOWN)
{
// Unknown was 'written'
// deal with Little Endian
else
{
binary_write(*fp, vr);
- assert( vr.size() == 2 );
+ gdcmAssertMacro( vr.size() == 2 );
if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
{
}
}
-//-----------------------------------------------------------------------------
-// Public
-
/**
- * \ingroup DocEntry
* \brief Gets the full length of the elementary DocEntry (not only value
* length) depending on the VR.
*/
}
/**
- * \ingroup DocEntry
* \brief Copies all the attributes from an other DocEntry
+ * @param doc entry to copy from
*/
-void DocEntry::Copy (DocEntry* e)
+void DocEntry::Copy(DocEntry *doc)
{
- DicomDict = e->DicomDict;
- UsableLength = e->UsableLength;
- ReadLength = e->ReadLength;
- ImplicitVR = e->ImplicitVR;
- Offset = e->Offset;
- PrintLevel = e->PrintLevel;
- // TODO : remove DocEntry SQDepth
+ Length = doc->Length;
+ ReadLength = doc->ReadLength;
+ ImplicitVR = doc->ImplicitVR;
+ Offset = doc->Offset;
}
/**
- * \ingroup DocEntry
* \brief tells us if entry is the last one of a 'no length' SequenceItem
* (fffe,e00d)
*/
{
return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
}
+
/**
- * \ingroup DocEntry
* \brief tells us if entry is the last one of a 'no length' Sequence
* (fffe,e0dd)
*/
//-----------------------------------------------------------------------------
// Protected
-
//-----------------------------------------------------------------------------
// Private
//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Prints the common part of ValEntry, BinEntry, SeqEntry
+ * @param os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
+ */
+void DocEntry::Print(std::ostream &os, std::string const & )
+{
+ size_t o;
+ std::string st;
+ TSKey v;
+ std::string d2, vr;
+ std::ostringstream s;
+ uint32_t lgth;
+
+ o = GetOffset();
+ vr = GetVR();
+ if(vr==GDCM_UNKNOWN)
+ vr=" ";
+ s << DictEntry::TranslateToKey(GetGroup(),GetElement());
+
+ if (PrintLevel >= 2)
+ {
+ s << " lg : ";
+ lgth = GetReadLength(); // ReadLength, as opposed to Length
+ if (lgth == 0xffffffff)
+ {
+ st = Util::Format("x(ffff)"); // I said : "x(ffff)" !
+ s.setf(std::ios::left);
+ s << std::setw(10-st.size()) << " ";
+ s << st << " ";
+ s.setf(std::ios::left);
+ s << std::setw(8) << "-1";
+ }
+ else
+ {
+ st = Util::Format("x(%x)",lgth);
+ s.setf(std::ios::left);
+ s << std::setw(10-st.size()) << " ";
+ s << st << " ";
+ s.setf(std::ios::left);
+ s << std::setw(8) << lgth;
+ }
+ s << " Off.: ";
+ st = Util::Format("x(%x)",o);
+ s << std::setw(10-st.size()) << " ";
+ s << st << " ";
+ s << std::setw(8) << o;
+ }
+
+ s << "[" << vr << "] ";
+
+ if (PrintLevel >= 1)
+ {
+ s.setf(std::ios::left);
+ s << std::setw(66-GetName().length()) << " ";
+ }
+
+ s << "[" << GetName()<< "]";
+ os << s.str();
+}
+
+//-----------------------------------------------------------------------------
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff