X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=31f74ae64890537f8d0d688992a557e32a3364ad;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=eef8c5700dbccbe9857e6c1b9a060e01b2b9b1c1;hpb=f564e117e998524a24ec56587e058b7e3625455c;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index eef8c570..31f74ae6 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/07/11 20:44:52 $
-  Version:   $Revision: 1.61 $
+  Date:      $Date: 2008/05/19 09:25:42 $
+  Version:   $Revision: 1.80 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,22 +18,19 @@
 
 #include "gdcmElementSet.h"
 #include "gdcmDebug.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
 #include "gdcmSeqEntry.h"
+#include "gdcmDataEntry.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief   Constructor for a given ElementSet
  */
-//BOZ depthLevel is not usefull anymore
-ElementSet::ElementSet(int depthLevel) 
+ElementSet::ElementSet() 
           : DocEntrySet()
 {
-  (void)depthLevel;
 }
 
 /**
@@ -50,15 +47,52 @@ 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)
+void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy, bool dummy2)
 {
+   bool insideMetaElements     = false;
+   bool yetOutsideMetaElements = false;
+   (void)dummy2;(void)dummy;
+   
    for (TagDocEntryHT::const_iterator i = TagHT.begin(); 
                                      i != TagHT.end(); 
                                     ++i)
    {
-      i->second->WriteContent(fp, filetype);
+        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( group ) )
+          continue;
+  
+      // Skip 'Group Length' element, since it may be wrong.
+      //       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 );
+       }             
    } 
 }
 
@@ -78,6 +112,7 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
    else
    {
       TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry));
+      newEntry->Register();
       return true;
    }
 }
@@ -92,30 +127,11 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
    if ( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      //gdcmWarningMacro( "One element erased.");
-      delete entryToRemove;
+      entryToRemove->Unregister();
       return true;
    }
 
-   gdcmWarningMacro( "Key not present");
-   return false ;
-}
-
-/**
- * \brief   Clear the hash table from given entry BUT keep the entry.
- * @param   entryToRemove Entry to remove.
- */
-bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
-{
-   const TagKey &key = entryToRemove->GetKey();
-   if ( TagHT.count(key) == 1 )
-   {
-      TagHT.erase(key);
-      //gdcmWarningMacro( "One element erased.");
-      return true;
-   }
-
-   gdcmWarningMacro( "Key not present");
+   gdcmWarningMacro( "Key not present : " << key);
    return false ;
 }
 
@@ -128,7 +144,7 @@ void ElementSet::ClearEntry()
    {
       if ( cc->second )
       {
-         delete cc->second;
+         cc->second->Unregister();
       }
    }
    TagHT.clear();
@@ -176,10 +192,77 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
 
    if ( it!=TagHT.end() )
       return it->second;
-//   this->Print( std::cerr );
    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
 
@@ -195,6 +278,14 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
   */ 
 void ElementSet::Print(std::ostream &os, std::string const & )
 {
+   // Let's change the 'warning value' for Pixel Data,
+   // to avoid human reader to be confused by 'gdcm::NotLoaded'.   
+   DataEntry *pixelElement = GetDataEntry(0x7fe0,0x0010);
+   if ( pixelElement != 0 )
+   {
+      pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA );
+   }
+
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
       DocEntry *entry = i->second;