Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2004/08/01 00:59:21 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2004/10/10 00:42:54 $
+ Version: $Revision: 1.26 $
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
gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in)
{
ImplicitVR = false;
- entry = in;
+ DictEntry = in;
+ SetKey( in->GetKey( ) );
+ Offset = 0 ; // To avoid further missprinting
}
//-----------------------------------------------------------------------------
* \brief Prints the common part of gdcmValEntry, gdcmBinEntry, gdcmSeqEntry
* @param os ostream we want to print in
*/
-void gdcmDocEntry::Print(std::ostream & os)
+void gdcmDocEntry::Print(std::ostream& os)
{
- printLevel=2; // FIXME
+ 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 ;
-
- if (printLevel>=2)
+
+ s << gdcmDictEntry::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 = gdcmUtil::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 = gdcmUtil::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 = gdcmUtil::Format("x(%x)",o);
+ s << std::setw(10-st.size()) << " ";
s << st << " ";
s << std::setw(8) << o;
}
s << "[" << vr << "] ";
- if (printLevel >= 1)
+ if (PrintLevel >= 1)
{
s.setf(std::ios::left);
s << std::setw(66-GetName().length()) << " ";
/**
* \ingroup gdcmDocEntry
* \brief Writes the common part of any gdcmValEntry, gdcmBinEntry, gdcmSeqEntry
+ * @param fp already open file pointer
+ * @param filetype type of the file to be written
*/
-void gdcmDocEntry::Write(FILE *fp, FileType filetype)
+void gdcmDocEntry::Write(FILE* fp, FileType filetype)
{
- uint32_t FFFF = 0xffffffff;
+ uint32_t ffff = 0xffffffff;
uint16_t group = GetGroup();
gdcmVRKey vr = GetVR();
uint16_t el = GetElement();
uint32_t lgr = GetReadLength();
- if ( (group == 0xfffe) && (el == 0x0000) )
+ if ( group == 0xfffe && el == 0x0000 )
{
// Fix in order to make some MR PHILIPS images e-film readable
// see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
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
// - 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
{
/**
* \ingroup gdcmDocEntry
- * \brief Gets the full length of the elementary DocEntry (not only value length)
+ * \brief Gets the full length of the elementary DocEntry (not only value
+ * length) depending on the VR.
*/
uint32_t gdcmDocEntry::GetFullLength()
{
*/
void gdcmDocEntry::Copy (gdcmDocEntry* e)
{
- entry = e->entry;
+ DictEntry = e->DictEntry;
UsableLength = e->UsableLength;
ReadLength = e->ReadLength;
ImplicitVR = e->ImplicitVR;
Offset = e->Offset;
- printLevel = e->printLevel;
+ PrintLevel = e->PrintLevel;
// TODO : remove gdcmDocEntry SQDepth
}
* \brief tells us if entry is the last one of a 'no length' SequenceItem
* (fffe,e00d)
*/
-bool gdcmDocEntry::isItemDelimitor()
+bool gdcmDocEntry::IsItemDelimitor()
{
return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
}
* \brief tells us if entry is the last one of a 'no length' Sequence
* (fffe,e0dd)
*/
-bool gdcmDocEntry::isSequenceDelimitor()
+bool gdcmDocEntry::IsSequenceDelimitor()
{
return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff