Program: gdcm
Module: $RCSfile: gdcmDicomDirMeta.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 10:29:55 $
- Version: $Revision: 1.27 $
+ Date: $Date: 2007/08/29 15:30:48 $
+ Version: $Revision: 1.39 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDocument.h"
#include "gdcmDocEntry.h"
#include "gdcmGlobal.h"
+#include "gdcmUtil.h"
+#include "gdcmDataEntry.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
DicomDirMeta::DicomDirMeta(bool empty):
DicomDirObject()
{
- if( !empty )
+ if ( !empty )
{
ListDicomDirStudyElem const &elemList =
Global::GetDicomDirElements()->GetDicomDirMetaElements();
/**
* \brief Writes the Meta Elements
* @param fp ofstream to write to
- * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+ * @param filetype type of the file (ImplicitVR, ExplicitVR, JPEG, JPEG2000 ...)
* @return
*/
-void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
-{
+void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype,
+ bool dummy, bool dummy2)
+{
+ // 'File Meta Information Version'
+
+ uint8_t fmiv[2] = {0x02,0x00};
+ // FIXME : the following doesn't make the job (?!?)
+ //SetEntryBinArea(fmiv, 0x0002,0x0001, 2);
+ DataEntry *e00002_0001 = GetDataEntry(0x0002,0x0001);
+ e00002_0001->CopyBinArea(fmiv, 2);
+
+ // 'Media Storage SOP Instance UID'
+ DataEntry *e00002_0003 = GetDataEntry(0x0002,0x0003);
+ e00002_0003->SetString(Util::CreateUniqueUID());
+
+ // 'Implementation Class UID'
+ DataEntry *e00002_0012 = GetDataEntry(0x0002,0x0012);
+ e00002_0012->SetString(Util::CreateUniqueUID());
+
+ // Entry : 0002|0000 = group length -> recalculated
+ DataEntry *e0000 = GetDataEntry(0x0002,0x0000);
+ std::ostringstream sLen;
+ sLen << ComputeGroup0002Length( );
+ e0000->SetString(sLen.str());
+
for (ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end();
- ++i)
+ i!= DocEntries.end();
+ ++i)
+ {
+ // true : we are in MetaElements
+ (*i)->WriteContent(fp, filetype, true, false);
+ }
+}
+
+/**
+ * \brief Re-computes the length of the Dicom group 0002 (in the DicomDirMeta)
+ */
+int DicomDirMeta::ComputeGroup0002Length( )
+{
+ uint16_t gr;
+ VRKey vr;
+
+ int groupLength = 0;
+ bool found0002 = false;
+
+ // for each Tag in the DicomDirMeta
+ DocEntry *entry = GetFirstEntry();
+ while( entry )
{
- (*i)->WriteContent(fp, filetype);
+ gr = entry->GetGroup();
+
+ if ( gr == 0x0002 )
+ {
+ found0002 = true;
+
+ if ( entry->GetElement() != 0x0000 )
+ {
+ vr = entry->GetVR();
+
+ if ( vr == "OB" )
+ {
+ groupLength += 4;
+ }
+ groupLength += 2 + 2 + 4 + entry->GetLength();
+ }
+ }
+ else if (found0002 )
+ break;
+
+ entry = GetNextEntry();
}
+ return groupLength;
}
//-----------------------------------------------------------------------------