Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2005/01/24 16:10:52 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2005/10/18 19:54:26 $
+ Version: $Revision: 1.72 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
-
-// CLEAN ME
-#define MAX_SIZE_PRINT_ELEMENT_VALUE 64
-
//-----------------------------------------------------------------------------
+
// Constructor / Destructor
/**
* \brief Constructor from a given DictEntry
}
//-----------------------------------------------------------------------------
-// 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();
-}
-
+// Public
/**
- * \brief Writes the common part of any ValEntry, BinEntry, SeqEntry
+ * \brief Writes the common part of any DataEntry, SeqEntry
* @param fp already open ofstream pointer
* @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
{
uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
- VRKey vr = GetVR();
+ VRKey vr = GetVR();
uint16_t el = GetElement();
- uint32_t lgr = GetLength();
+ uint32_t lgth = 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 )
+ // Dicom V3 group 0x0002 is *always* Explicit VR !
+ if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
{
// Special case of delimiters:
if (group == 0xfffe)
{
// Delimiters have NO Value Representation
// 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 SeqItem by writting
+ // a Item Delimitation Item (fffe, e00d)
uint32_t ff = 0xffffffff;
binary_write(*fp, ff);
return;
}
- uint16_t z = 0;
- uint16_t shortLgr = lgr;
+ uint16_t zero = 0;
+ uint16_t shortLgr = (uint16_t)lgth;
- if (vr == GDCM_UNKNOWN)
+ if( IsVRUnknown() )
{
- // Unknown was 'written'
- // deal with Little Endian
- binary_write(*fp, shortLgr);
- binary_write(*fp, z);
+ // GDCM_VRUNKNOWN was stored in the Entry VR;
+ // deal with Entry as if TS were Implicit VR
+
+ // FIXME : troubles expected on big endian processors :
+ // let lgth = 0x00001234
+ // we write 34 12 00 00 on little endian proc (OK)
+ // we write 12 34 00 00 on big endian proc (KO)
+ //binary_write(*fp, shortLgr);
+ //binary_write(*fp, zero);
+
+ binary_write(*fp, lgth);
}
else
{
- binary_write(*fp, vr);
- gdcmAssertMacro( vr.size() == 2 );
+ binary_write(*fp, vr.str());
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
+ if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
{
- binary_write(*fp, z);
+ binary_write(*fp, zero);
if (vr == "SQ")
{
// we set SQ length to ffffffff
}
else
{
- binary_write(*fp, lgr);
+ binary_write(*fp, lgth);
}
}
else
}
else
{
- binary_write(*fp, lgr);
+ binary_write(*fp, lgth);
}
}
}
-//-----------------------------------------------------------------------------
-// Public
-
/**
* \brief Gets the full length of the elementary DocEntry (not only value
* length) depending on the VR.
}
/**
- * \brief Copies all the attributes from an other DocEntry
- * @param e entry to copy from
+ * \brief tells us if entry is the last one of a 'no length' SequenceItem
+ * (fffe,e00d)
*/
-void DocEntry::Copy(DocEntry *e)
+bool DocEntry::IsItemDelimitor()
{
- Length = e->Length;
- ReadLength = e->ReadLength;
- ImplicitVR = e->ImplicitVR;
- Offset = e->Offset;
+ return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
}
/**
- * \brief tells us if entry is the last one of a 'no length' SequenceItem
- * (fffe,e00d)
+ * \brief tells us if entry is the first one of an Item
+ * (fffe,e000)
*/
-bool DocEntry::IsItemDelimitor()
+bool DocEntry::IsItemStarter()
{
- return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
+ return (GetGroup() == 0xfffe && GetElement() == 0xe000);
}
+
/**
* \brief tells us if entry is the last one of a 'no length' Sequence
* (fffe,e0dd)
return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
}
+/**
+ * \brief Copies all the attributes from an other DocEntry
+ * @param doc entry to copy from
+ */
+void DocEntry::Copy(DocEntry *doc)
+{
+ Length = doc->Length;
+ ReadLength = doc->ReadLength;
+ ImplicitVR = doc->ImplicitVR;
+ Offset = doc->Offset;
+}
+
//-----------------------------------------------------------------------------
// Protected
-
//-----------------------------------------------------------------------------
// Private
//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Prints the common part of DataEntry, 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;
+ VRKey vr;
+ std::ostringstream s;
+ uint32_t lgth;
+
+ o = GetOffset();
+ vr = GetVR();
+ if ( vr == GDCM_VRUNKNOWN )
+ vr=" ";
+
+ s << DictEntry::TranslateToKey(GetGroup(),GetElement());
+ if (PrintLevel >= 2)
+ {
+ s << " lg : ";
+ lgth = GetReadLength(); // ReadLength, as opposed to (usable) Length
+ if (lgth == 0xffffffff)
+ {
+ st = " ffff ";
+ s.setf(std::ios::left);
+ s << std::setw(4);
+ s << " x(ffff) ";
+ s.setf(std::ios::left);
+ s << std::setw(8) << "-1";
+ }
+ else
+ {
+ st = Util::Format("x(%x)",lgth); // we may keep it
+ s.setf(std::ios::left);
+ s << std::setw(11-st.size()) << " ";
+ s << st << " ";
+ s.setf(std::ios::left);
+ s << std::setw(8) << lgth;
+ }
+ s << " Off.: ";
+ st = Util::Format("x(%x)",o); // we may keep it
+ s << std::setw(11-st.size()) << " ";
+ s << st << " ";
+ s << std::setw(8) << o;
+ }
+ if (PrintLevel >= 1)
+ s << " ";
+
+ s << "[" << vr << "] ";
+
+ std::string name;
+ if ( GetElement() == 0x0000 )
+ name = "Group Length";
+ else
+ name = GetName();
+
+ if (PrintLevel >= 1)
+ {
+ s.setf(std::ios::left);
+ s << std::setw(66-name.length()) << " ";
+ }
+
+ s << "[" << name << "]";
+ os << s.str();
+}
+
+//-----------------------------------------------------------------------------
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff