Minor modifications

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 4804928cb7ac8173dbbd62a9c069fcccafc5fda3..c4934ece81fd6d87bbb8f1bc19fa965995be9ec9 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 12:48:47 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2006/10/23 15:45:19 $
+  Version:   $Revision: 1.74 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,7 +47,7 @@ ElementSet::~ElementSet()
   * \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)
 {
@@ -62,12 +62,20 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
        // if they were found in the original document. 
        if ( !MayIWrite( (i->second)->GetGroup() ) ) 
           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  && (i->second)->GetGroup() == 0x0008 ) )
+        )
+       {
+             i->second->WriteContent(fp, filetype);
+       }             
    } 
 }
 
@@ -193,6 +201,51 @@ void ElementSet::Copy(DocEntrySet *set)
    }
 }
 
+/**
+ * \brief Checks whether *all* the DataEntries of the group have all
+ *        the same type for VR (ImplicitVR or ExplicitVR) 
+ * @param group group number to be checked
+ * @return 1:ImplicitVR 2:ExplicitVR -1:NotCoherent 
+ */
+int ElementSet::IsVRCoherent( uint16_t group )
+{
+   uint16_t currentGroup;
+   int codeVR = -1;
+   int currentCodeVR;
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   {
+      currentGroup = cc->second->GetGroup();
+
+      if ( currentGroup < group )
+         continue;   
+      if ( currentGroup > group )
+         break;
+      // currentGroup == group
+      if (codeVR == -1)
+      {
+         if (cc->second->IsImplicitVR() )
+            codeVR = 1;
+         else 
+            codeVR = 2;
+         continue;
+      }
+      else
+      {
+         if (cc->second->IsImplicitVR() )
+            currentCodeVR = 1; //Implicit
+         else 
+            currentCodeVR = 2; // Explicit  
+  
+         if ( currentCodeVR == codeVR )
+           continue;
+         else
+            return -1;    // -1 : not coherent 
+      }
+   }   
+   return codeVR;
+}
+
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -223,7 +276,7 @@ void ElementSet::Print(std::ostream &os, std::string const & )
       entry->SetPrintLevel(PrintLevel);
       entry->Print(os);   
 
-      if ( dynamic_cast<SeqEntry *>(entry) )
+      if ( dynamic_cast<SeqEntry*>(entry) )
       {
          // Avoid the newline for a sequence:
          continue;