Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:14 $
- Version: $Revision: 1.73 $
+ Date: $Date: 2007/08/29 15:30:49 $
+ Version: $Revision: 1.78 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSeqEntry.h"
#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
* \brief Writes the Header Entries (Dicom Elements)
* from the H Table
* @param fp ofstream to write to
- * @param filetype filetype
+ * @param filetype ExplicitVR/ImplicitVR/ACR/ACR_LIBIDO/JPEG/JPEG2000/...
*/
-void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy, bool dummy2)
{
+ bool insideMetaElements = false;
+ bool yetOutsideMetaElements = false;
+ int countSQ =0;
+
for (TagDocEntryHT::const_iterator i = TagHT.begin();
i != TagHT.end();
++i)
- {
+ {
+ int group = (i->second)->GetGroup();
+
+ if (yetOutsideMetaElements==false && group == 0x0002)
+ insideMetaElements = true;
+
+ if (insideMetaElements == true && group != 0x0002)
+ {
+ yetOutsideMetaElements = true;
+ insideMetaElements = false;
+ }
+
// depending on the gdcm::Document type
// (gdcm::File; gdcm::DicomDir, (more to come ?)
// some groups *cannot* be present.
// We hereby protect gdcm for writting stupid things
// if they were found in the original document.
- if ( !MayIWrite( (i->second)->GetGroup() ) )
+ if ( !MayIWrite( group ) )
continue;
+
// Skip 'Group Length' element, since it may be wrong.
- // except for Group 0002
- if ( (i->second)->GetElement() == 0x0000
- && (i->second)->GetGroup() != 0x0002 )
- continue;
- i->second->WriteContent(fp, filetype);
+ // except for Group 0x0002
+ // ( keep it as well for Group 0x0008 of ACR Files,
+ // since some ACR readers *need* it )
+
+ if ( (i->second)->GetElement() != 0x0000
+ ||
+ ( (i->second)->GetGroup() == 0x0002
+ ||( (filetype == ACR || filetype == ACR_LIBIDO ) && (i->second)->GetGroup() == 0x0008 ) )
+ )
+ {
+ // There are DocEntries, written recursively
+ // false : we are outside any Sequence
+ i->second->WriteContent(fp, filetype, insideMetaElements, false );
+ }
}
}