X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirMeta.cxx;h=0d450d0b979c7a7a0ad36b32fc9a1e5a1923a13a;hb=98cf38e32be18dc2b7d3d1a13e45f60717b008bc;hp=11602a6659824365deb59109a39c39d97e2e4307;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index 11602a66..0d450d0b 100644
--- a/src/gdcmDicomDirMeta.cxx
+++ b/src/gdcmDicomDirMeta.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 16:10:52 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2005/11/04 15:33:35 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,20 +20,19 @@
 #include "gdcmDocument.h"
 #include "gdcmDocEntry.h"
 #include "gdcmGlobal.h"
-
+#include "gdcmUtil.h"
+#include "gdcmDataEntry.h"
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
 /**
  * \brief  Constructor
  */ 
 DicomDirMeta::DicomDirMeta(bool empty):
    DicomDirObject()
 {
-   if( !empty )
+   if ( !empty )
    {
       ListDicomDirStudyElem const &elemList = 
          Global::GetDicomDirElements()->GetDicomDirMetaElements();
@@ -48,32 +47,8 @@ DicomDirMeta::~DicomDirMeta()
 {
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Prints the Meta Elements
- * @param os ostream to write to 
- * @param indent Indentation string to be prepended during printing
- */ 
-void DicomDirMeta::Print(std::ostream &os, std::string const & )
-{
-   os << "META" << std::endl;
-   // warning : META doesn't behave exactly like a Objet 
-   for (ListDocEntry::iterator i = DocEntries.begin();
-        i != DocEntries.end();
-        ++i)
-   {
-      (*i)->SetPrintLevel(PrintLevel);
-      (*i)->Print();
-      os << std::endl;
-   }
-}
-
-
 //-----------------------------------------------------------------------------
 // Public
-
-
 /**
  * \brief   Writes the Meta Elements
  * @param fp ofstream to write to
@@ -81,7 +56,29 @@ void DicomDirMeta::Print(std::ostream &os, std::string const & )
  * @return
  */ 
 void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
-{   
+{  
+   // '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)
@@ -90,11 +87,72 @@ void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
    }
 }
 
+/**
+ * \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 )
+   {
+      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; 
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
 //-----------------------------------------------------------------------------
 // Private
 
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints the Meta Elements
+ * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
+ */ 
+void DicomDirMeta::Print(std::ostream &os, std::string const & )
+{
+   os << "META" << std::endl;
+   // warning : META doesn't behave exactly like a Objet 
+   for (ListDocEntry::iterator i = DocEntries.begin();
+        i != DocEntries.end();
+        ++i)
+   {
+      (*i)->SetPrintLevel(PrintLevel);
+      (*i)->Print();
+      os << std::endl;
+   }
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm