Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2006/07/04 07:58:50 $
- Version: $Revision: 1.84 $
+ Date: $Date: 2007/02/23 15:29:56 $
+ Version: $Revision: 1.87 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
binary_write( *fp, elem); //element number
// Dicom V3 group 0x0002 is *always* Explicit VR !
- if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
+ if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || group == 0x0002 )
{
// ----------- Writes the common part : the VR + the length
|| (vr == "UN") || (vr == "UT") )
{
binary_write(*fp, zero);
- if (filetype == JPEG && GetGroup() == 0x7fe0 && GetElement() == 0x0010)
+ if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010)
{
gdcmAssertMacro( GetVR() == "OW" );
binary_write(*fp, ffff);
return l;
}
-/**
- * \brief tells us if entry is the last one of a 'no length' SequenceItem
- * (fffe,e00d)
- */
-bool DocEntry::IsItemDelimitor()
-{
- return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
-}
-
-/**
- * \brief tells us if entry is the first one of an Item
- * (fffe,e000)
- */
-bool DocEntry::IsItemStarter()
-{
- return (GetGroup() == 0xfffe && GetElement() == 0xe000);
-}
-
-/**
- * \brief tells us if entry is the last one of a 'no length' Sequence
- * (fffe,e0dd)
- */
-bool DocEntry::IsSequenceDelimitor()
-{
- return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
-}
-
/**
* \brief Copies all the attributes from an other DocEntry
* @param doc entry to copy from
if ( GetElement() == 0x0000 )
name = "Group Length";
else
+ {
name = GetName();
-
+ // prevent Print from any CR at end of name (hope it's enought!)
+ if (name[name.length()-1] == 0x0d || name[name.length()-1] == 0x0a)
+ {
+ name.replace(name.length()-1, 1, 1, ' ');
+ }
+ }
if (PrintLevel >= 1)
{
s.setf(std::ios::left);