X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=f073783c9b2528741be56b17b8a3e9b87d5273f9;hb=029ba8b100584e6ee9d963589e3a1d36205f25c4;hp=c59de89aecbd496b0911f67da800c56359e866ea;hpb=9eb58f53b417ac50bdfa817a02e6dd19ac6fbeb8;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index c59de89a..f073783c 100644
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/26 09:15:19 $
-  Version:   $Revision: 1.69 $
+  Date:      $Date: 2006/01/31 11:39:47 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -62,13 +62,11 @@ 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)->GetElement() != 0x0002 )
-          continue;
-      
+         && (i->second)->GetGroup() != 0x0002 )
+          continue; 
        i->second->WriteContent(fp, filetype);
    } 
 }
@@ -172,6 +170,74 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
    return NULL;
 }
 
+/**
+ * \brief Copies all the attributes from an other DocEntrySet 
+ * @param set entry to copy from
+ * @remarks The contained DocEntries a not copied, only referenced
+ */
+void ElementSet::Copy(DocEntrySet *set)
+{
+   // Remove all previous entries
+   ClearEntry();
+
+   DocEntrySet::Copy(set);
+
+   ElementSet *eltSet = dynamic_cast<ElementSet *>(set);
+   if( eltSet )
+   {
+      TagHT = eltSet->TagHT;
+      for(ItTagHT = TagHT.begin();ItTagHT != TagHT.end();++ItTagHT)
+      {
+         (ItTagHT->second)->Register();
+      }
+   }
+}
+
+/**
+ * \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